Mercurial > evolve
comparison tests/test-fixup.t @ 6250:35523be9534a mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 25 Apr 2022 22:14:16 +0400 |
| parents | e6ae5af97683 |
| children | 314682992f7d 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6249:14152b9abf93 | 6250:35523be9534a |
|---|---|
| 173 $ hg fixup -r 'desc("update foo")' | 173 $ hg fixup -r 'desc("update foo")' |
| 174 merging foo | 174 merging foo |
| 175 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 175 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
| 176 unresolved merge conflicts | 176 unresolved merge conflicts |
| 177 (see 'hg help evolve.interrupted') | 177 (see 'hg help evolve.interrupted') |
| 178 [240] | 178 [1] |
| 179 | 179 |
| 180 $ hg diff | 180 $ hg diff |
| 181 diff --git a/foo b/foo | 181 diff --git a/foo b/foo |
| 182 --- a/foo | 182 --- a/foo |
| 183 +++ b/foo | 183 +++ b/foo |
| 206 $ hg fixup -r 'desc("update foo")' | 206 $ hg fixup -r 'desc("update foo")' |
| 207 merging foo | 207 merging foo |
| 208 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 208 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
| 209 unresolved merge conflicts | 209 unresolved merge conflicts |
| 210 (see 'hg help evolve.interrupted') | 210 (see 'hg help evolve.interrupted') |
| 211 [240] | 211 [1] |
| 212 | 212 |
| 213 $ hg abort | 213 $ hg abort |
| 214 fixup aborted | 214 fixup aborted |
| 215 working directory is now at 12b5e442244f | 215 working directory is now at 12b5e442244f |
| 216 | 216 |
| 219 $ hg fixup -r 'desc("update foo")' | 219 $ hg fixup -r 'desc("update foo")' |
| 220 merging foo | 220 merging foo |
| 221 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 221 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
| 222 unresolved merge conflicts | 222 unresolved merge conflicts |
| 223 (see 'hg help evolve.interrupted') | 223 (see 'hg help evolve.interrupted') |
| 224 [240] | 224 [1] |
| 225 | 225 |
| 226 $ hg status --verbose | 226 $ hg status --verbose |
| 227 M foo | 227 M foo |
| 228 ? foo.orig | 228 ? foo.orig |
| 229 # The repository is in an unfinished *fixup* state. | 229 # The repository is in an unfinished *fixup* state. |
| 362 -r --rev REV revision to amend | 362 -r --rev REV revision to amend |
| 363 -c --continue continue an interrupted fixup | 363 -c --continue continue an interrupted fixup |
| 364 --abort abort an interrupted fixup | 364 --abort abort an interrupted fixup |
| 365 | 365 |
| 366 (use 'hg fixup -h' to show more help) | 366 (use 'hg fixup -h' to show more help) |
| 367 [10] | 367 [255] |
| 368 | 368 |
| 369 $ hg fixup :10 -r 5 | 369 $ hg fixup :10 -r 5 |
| 370 abort: please specify just one revision | 370 abort: please specify just one revision |
| 371 [255] | 371 [255] |
| 372 | 372 |