Show More
@@ -178,14 +178,15 b' def _premerge(repo, toolconf, files, lab' | |||||
178 |
|
178 | |||
179 | ui = repo.ui |
|
179 | ui = repo.ui | |
180 |
|
180 | |||
|
181 | validkeep = ['keep'] | |||
|
182 | ||||
181 | # do we attempt to simplemerge first? |
|
183 | # do we attempt to simplemerge first? | |
182 | try: |
|
184 | try: | |
183 | premerge = _toolbool(ui, tool, "premerge", not binary) |
|
185 | premerge = _toolbool(ui, tool, "premerge", not binary) | |
184 | except error.ConfigError: |
|
186 | except error.ConfigError: | |
185 | premerge = _toolstr(ui, tool, "premerge").lower() |
|
187 | premerge = _toolstr(ui, tool, "premerge").lower() | |
186 | valid = 'keep'.split() |
|
188 | if premerge not in validkeep: | |
187 | if premerge not in valid: |
|
189 | _valid = ', '.join(["'" + v + "'" for v in validkeep]) | |
188 | _valid = ', '.join(["'" + v + "'" for v in valid]) |
|
|||
189 | raise error.ConfigError(_("%s.premerge not valid " |
|
190 | raise error.ConfigError(_("%s.premerge not valid " | |
190 | "('%s' is neither boolean nor %s)") % |
|
191 | "('%s' is neither boolean nor %s)") % | |
191 | (tool, premerge, _valid)) |
|
192 | (tool, premerge, _valid)) | |
@@ -195,7 +196,7 b' def _premerge(repo, toolconf, files, lab' | |||||
195 | if not r: |
|
196 | if not r: | |
196 | ui.debug(" premerge successful\n") |
|
197 | ui.debug(" premerge successful\n") | |
197 | return 0 |
|
198 | return 0 | |
198 |
if premerge |
|
199 | if premerge not in validkeep: | |
199 | util.copyfile(back, a) # restore from backup and try again |
|
200 | util.copyfile(back, a) # restore from backup and try again | |
200 | return 1 # continue merging |
|
201 | return 1 # continue merging | |
201 |
|
202 |
General Comments 0
You need to be logged in to leave comments.
Login now