From 127815dd1f4caeaf8017b95cb17a8e8ef160e011 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 13 Aug 2014 16:23:47 -0400 Subject: [PATCH] revert: revert files with "C"onflicts --- jsvn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsvn b/jsvn index 5dca052..b37092a 100755 --- a/jsvn +++ b/jsvn @@ -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)