Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 26614:ef1eb6df7071
simplemerge: move conflict warning message to filemerge
The current output for a failed merge with conflict markers looks something like:
merging foo
warning: conflicts during merge.
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
merging bar
warning: conflicts during merge.
merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
We're going to change the way merges are done to perform all premerges before
all merges, so that the output above would look like:
merging foo
merging bar
warning: conflicts during merge.
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
warning: conflicts during merge.
merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
The 'warning: conflicts during merge' line has no context, so is pretty
confusing.
This patch will change the future output to:
merging foo
merging bar
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
The hint on how to resolve the conflicts makes this a bit unwieldy, but solving
that is tricky because we already hint that people run 'hg resolve' to retry
unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker
based resolution.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 09 Oct 2015 13:54:52 -0700 |
| parents | abb5ec3eb6ce |
| children | a1e43e85d294 |
comparison
equal
deleted
inserted
replaced
| 26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
|---|---|
| 253 | 253 |
| 254 r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) | 254 r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) |
| 255 return True, r | 255 return True, r |
| 256 | 256 |
| 257 @internaltool('union', fullmerge, | 257 @internaltool('union', fullmerge, |
| 258 _("merging %s incomplete! " | 258 _("warning: conflicts while merging %s! " |
| 259 "(edit conflicts, then use 'hg resolve --mark')\n"), | 259 "(edit, then use 'hg resolve --mark')\n"), |
| 260 precheck=_symlinkcheck) | 260 precheck=_symlinkcheck) |
| 261 def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | 261 def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
| 262 """ | 262 """ |
| 263 Uses the internal non-interactive simple merge algorithm for merging | 263 Uses the internal non-interactive simple merge algorithm for merging |
| 264 files. It will use both left and right sides for conflict regions. | 264 files. It will use both left and right sides for conflict regions. |
| 265 No markers are inserted.""" | 265 No markers are inserted.""" |
| 266 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, | 266 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, |
| 267 files, labels, 'union') | 267 files, labels, 'union') |
| 268 | 268 |
| 269 @internaltool('merge', fullmerge, | 269 @internaltool('merge', fullmerge, |
| 270 _("merging %s incomplete! " | 270 _("warning: conflicts while merging %s! " |
| 271 "(edit conflicts, then use 'hg resolve --mark')\n"), | 271 "(edit, then use 'hg resolve --mark')\n"), |
| 272 precheck=_symlinkcheck) | 272 precheck=_symlinkcheck) |
| 273 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | 273 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
| 274 """ | 274 """ |
| 275 Uses the internal non-interactive simple merge algorithm for merging | 275 Uses the internal non-interactive simple merge algorithm for merging |
| 276 files. It will fail if there are any conflicts and leave markers in | 276 files. It will fail if there are any conflicts and leave markers in |
| 278 of merge.""" | 278 of merge.""" |
| 279 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, | 279 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, |
| 280 files, labels, 'merge') | 280 files, labels, 'merge') |
| 281 | 281 |
| 282 @internaltool('merge3', fullmerge, | 282 @internaltool('merge3', fullmerge, |
| 283 _("merging %s incomplete! " | 283 _("warning: conflicts while merging %s! " |
| 284 "(edit conflicts, then use 'hg resolve --mark')\n"), | 284 "(edit, then use 'hg resolve --mark')\n"), |
| 285 precheck=_symlinkcheck) | 285 precheck=_symlinkcheck) |
| 286 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | 286 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
| 287 """ | 287 """ |
| 288 Uses the internal non-interactive simple merge algorithm for merging | 288 Uses the internal non-interactive simple merge algorithm for merging |
| 289 files. It will fail if there are any conflicts and leave markers in | 289 files. It will fail if there are any conflicts and leave markers in |