josh/jsvn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert: revert files with "C"onflicts

Browse Source
This commit is contained in:
Josh Holtrop 2014-08-13 16:23:47 -04:00
parent 3fbec5ea29
commit 127815dd1f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsvn
View File

@ -1244,7 +1244,7 @@ def revert_h(argv, svn, out, config):
if m is not None:
action = line[0]
prop_action = line[1]
if action in ('A', 'M', 'D', '!') or prop_action == 'M':
if action in ('A', 'M', 'C', 'D', '!') or prop_action == 'M':
fname = m.group(1)
if action in ('D', '!'):
modified_files.append(fname)