Mercurial > hg
comparison tests/test-rebase-abort.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 | 6084926366b9 |
| children | e9b3d523f2e6 |
comparison
equal
deleted
inserted
replaced
| 26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
|---|---|
| 62 | 62 |
| 63 $ hg rebase -s 3 -d 2 | 63 $ hg rebase -s 3 -d 2 |
| 64 rebasing 3:3163e20567cc "L1" | 64 rebasing 3:3163e20567cc "L1" |
| 65 rebasing 4:46f0b057b5c0 "L2" (tip) | 65 rebasing 4:46f0b057b5c0 "L2" (tip) |
| 66 merging common | 66 merging common |
| 67 warning: conflicts during merge. | 67 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
| 68 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 69 unresolved conflicts (see hg resolve, then hg rebase --continue) | 68 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 70 [1] | 69 [1] |
| 71 | 70 |
| 72 Abort: | 71 Abort: |
| 73 | 72 |
| 92 | 91 |
| 93 $ hg rebase -s 3 -d 2 | 92 $ hg rebase -s 3 -d 2 |
| 94 rebasing 3:3163e20567cc "L1" | 93 rebasing 3:3163e20567cc "L1" |
| 95 rebasing 4:46f0b057b5c0 "L2" (tip) | 94 rebasing 4:46f0b057b5c0 "L2" (tip) |
| 96 merging common | 95 merging common |
| 97 warning: conflicts during merge. | 96 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
| 98 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 99 unresolved conflicts (see hg resolve, then hg rebase --continue) | 97 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 100 [1] | 98 [1] |
| 101 | 99 |
| 102 $ mv .hg/rebasestate .hg/rebasestate.back | 100 $ mv .hg/rebasestate .hg/rebasestate.back |
| 103 $ hg update --quiet --clean 2 | 101 $ hg update --quiet --clean 2 |
| 163 $ hg rebase -b 4 -d 2 | 161 $ hg rebase -b 4 -d 2 |
| 164 rebasing 3:a6484957d6b9 "B bis" | 162 rebasing 3:a6484957d6b9 "B bis" |
| 165 note: rebase of 3:a6484957d6b9 created no changes to commit | 163 note: rebase of 3:a6484957d6b9 created no changes to commit |
| 166 rebasing 4:145842775fec "C1" (tip) | 164 rebasing 4:145842775fec "C1" (tip) |
| 167 merging c | 165 merging c |
| 168 warning: conflicts during merge. | 166 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 169 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 170 unresolved conflicts (see hg resolve, then hg rebase --continue) | 167 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 171 [1] | 168 [1] |
| 172 | 169 |
| 173 $ hg tglog | 170 $ hg tglog |
| 174 @ 4:draft 'C1' | 171 @ 4:draft 'C1' |
| 223 | 220 |
| 224 | 221 |
| 225 $ hg rebase -d master -r foo | 222 $ hg rebase -d master -r foo |
| 226 rebasing 3:6c0f977a22d8 "C" (tip foo) | 223 rebasing 3:6c0f977a22d8 "C" (tip foo) |
| 227 merging c | 224 merging c |
| 228 warning: conflicts during merge. | 225 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 229 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 230 unresolved conflicts (see hg resolve, then hg rebase --continue) | 226 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 231 [1] | 227 [1] |
| 232 $ hg rebase --abort | 228 $ hg rebase --abort |
| 233 rebase aborted | 229 rebase aborted |
| 234 $ hg log -G --template "{rev} {desc} {bookmarks}" | 230 $ hg log -G --template "{rev} {desc} {bookmarks}" |