Mercurial > hg
comparison tests/test-histedit-fold-non-commute.t @ 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 | 477e76936b1d |
| children | 5837ca674da9 |
comparison
equal
deleted
inserted
replaced
| 26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
|---|---|
| 86 | 86 |
| 87 edit the history | 87 edit the history |
| 88 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle | 88 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
| 89 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 89 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 90 merging e | 90 merging e |
| 91 warning: conflicts during merge. | 91 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 92 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 93 Fix up the change and run hg histedit --continue | 92 Fix up the change and run hg histedit --continue |
| 94 | 93 |
| 95 fix up | 94 fix up |
| 96 $ echo 'I can haz no commute' > e | 95 $ echo 'I can haz no commute' > e |
| 97 $ hg resolve --mark e | 96 $ hg resolve --mark e |
| 121 | 120 |
| 122 | 121 |
| 123 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 122 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 124 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 123 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 125 merging e | 124 merging e |
| 126 warning: conflicts during merge. | 125 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 127 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 128 Fix up the change and run hg histedit --continue | 126 Fix up the change and run hg histedit --continue |
| 129 | 127 |
| 130 just continue this time | 128 just continue this time |
| 131 $ hg revert -r 'p1()' e | 129 $ hg revert -r 'p1()' e |
| 132 $ hg resolve --mark e | 130 $ hg resolve --mark e |
| 251 | 249 |
| 252 edit the history | 250 edit the history |
| 253 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle | 251 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
| 254 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 252 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 255 merging e | 253 merging e |
| 256 warning: conflicts during merge. | 254 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 257 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 258 Fix up the change and run hg histedit --continue | 255 Fix up the change and run hg histedit --continue |
| 259 | 256 |
| 260 fix up | 257 fix up |
| 261 $ echo 'I can haz no commute' > e | 258 $ echo 'I can haz no commute' > e |
| 262 $ hg resolve --mark e | 259 $ hg resolve --mark e |
| 264 $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' | 261 $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
| 265 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 262 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 266 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 267 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 264 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 268 merging e | 265 merging e |
| 269 warning: conflicts during merge. | 266 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 270 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 271 Fix up the change and run hg histedit --continue | 267 Fix up the change and run hg histedit --continue |
| 272 | 268 |
| 273 just continue this time | 269 just continue this time |
| 274 $ hg revert -r 'p1()' e | 270 $ hg revert -r 'p1()' e |
| 275 $ hg resolve --mark e | 271 $ hg resolve --mark e |