~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a --reset option to resolved
[stgit]
/
stgit
/
commands
/
common.py
diff --git
a/stgit/commands/common.py
b/stgit/commands/common.py
index
4e4a79f
..
7a9df6e
100644
(file)
--- a/
stgit/commands/common.py
+++ b/
stgit/commands/common.py
@@
-99,18
+99,26
@@
def print_crt_patch():
else:
print 'No patches applied'
else:
print 'No patches applied'
-def resolved(filename):
+def resolved(filename, reset = None):
+ if reset:
+ reset_file = filename + '.' + reset
+ if os.path.isfile(reset_file):
+ if os.path.isfile(filename):
+ os.remove(filename)
+ os.rename(reset_file, filename)
+
git.update_cache([filename], force = True)
git.update_cache([filename], force = True)
+
for ext in ['.local', '.older', '.remote']:
fn = filename + ext
if os.path.isfile(fn):
os.remove(fn)
for ext in ['.local', '.older', '.remote']:
fn = filename + ext
if os.path.isfile(fn):
os.remove(fn)
-def resolved_all():
+def resolved_all(
reset = None
):
conflicts = git.get_conflicts()
if conflicts:
for filename in conflicts:
conflicts = git.get_conflicts()
if conflicts:
for filename in conflicts:
- resolved(filename)
+ resolved(filename
, reset
)
os.remove(os.path.join(git.base_dir, 'conflicts'))
def name_email(string):
os.remove(os.path.join(git.base_dir, 'conflicts'))
def name_email(string):