Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 22023:f18830651811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: burn "minimal" feature to the ground Matt Mackall said: The goal of simplemerge should have always been to be a drop-in replacement for RCS merge. Please nuke this minimization thing entirely. This whole things is now dead.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 14:56:25 -0700
parents 2ea6d906cf9b
children 5f22975d320d
comparison
equal deleted inserted replaced
22022:2ea6d906cf9b 22023:f18830651811
189 raise error.ConfigError(_("%s.premerge not valid " 189 raise error.ConfigError(_("%s.premerge not valid "
190 "('%s' is neither boolean nor %s)") % 190 "('%s' is neither boolean nor %s)") %
191 (tool, premerge, _valid)) 191 (tool, premerge, _valid))
192 192
193 if premerge: 193 if premerge:
194 r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels, 194 r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels)
195 no_minimal=True)
196 if not r: 195 if not r:
197 ui.debug(" premerge successful\n") 196 ui.debug(" premerge successful\n")
198 return 0 197 return 0
199 if premerge != 'keep': 198 if premerge != 'keep':
200 util.copyfile(back, a) # restore from backup and try again 199 util.copyfile(back, a) # restore from backup and try again
217 if r: 216 if r:
218 a, b, c, back = files 217 a, b, c, back = files
219 218
220 ui = repo.ui 219 ui = repo.ui
221 220
222 r = simplemerge.simplemerge(ui, a, b, c, label=labels, no_minimal=True) 221 r = simplemerge.simplemerge(ui, a, b, c, label=labels)
223 return True, r 222 return True, r
224 return False, 0 223 return False, 0
225 224
226 @internaltool('tagmerge', True, 225 @internaltool('tagmerge', True,
227 _("automatic tag merging of %s failed! " 226 _("automatic tag merging of %s failed! "