Mercurial > evolve
comparison tests/test-fixup.t @ 6181:e6ae5af97683 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:19:44 +0300 |
| parents | cd07d6bd4e2a |
| children | 35523be9534a |
comparison
equal
deleted
inserted
replaced
| 6180:0042d69b8648 | 6181:e6ae5af97683 |
|---|---|
| 160 $ hg fixup -r 'desc("update foo")' | 160 $ hg fixup -r 'desc("update foo")' |
| 161 merging foo | 161 merging foo |
| 162 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 162 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
| 163 unresolved merge conflicts | 163 unresolved merge conflicts |
| 164 (see 'hg help evolve.interrupted') | 164 (see 'hg help evolve.interrupted') |
| 165 [240] | 165 [1] |
| 166 | 166 |
| 167 $ hg diff | 167 $ hg diff |
| 168 diff --git a/foo b/foo | 168 diff --git a/foo b/foo |
| 169 --- a/foo | 169 --- a/foo |
| 170 +++ b/foo | 170 +++ b/foo |
| 193 $ hg fixup -r 'desc("update foo")' | 193 $ hg fixup -r 'desc("update foo")' |
| 194 merging foo | 194 merging foo |
| 195 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 195 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
| 196 unresolved merge conflicts | 196 unresolved merge conflicts |
| 197 (see 'hg help evolve.interrupted') | 197 (see 'hg help evolve.interrupted') |
| 198 [240] | 198 [1] |
| 199 | 199 |
| 200 $ hg status --verbose | 200 $ hg status --verbose |
| 201 M foo | 201 M foo |
| 202 ? foo.orig | 202 ? foo.orig |
| 203 # The repository is in an unfinished *fixup* state. | 203 # The repository is in an unfinished *fixup* state. |
| 336 -r --rev REV revision to amend | 336 -r --rev REV revision to amend |
| 337 -c --continue continue an interrupted fixup | 337 -c --continue continue an interrupted fixup |
| 338 --abort abort an interrupted fixup | 338 --abort abort an interrupted fixup |
| 339 | 339 |
| 340 (use 'hg fixup -h' to show more help) | 340 (use 'hg fixup -h' to show more help) |
| 341 [10] | 341 [255] |
| 342 | 342 |
| 343 $ hg fixup :10 -r 5 | 343 $ hg fixup :10 -r 5 |
| 344 abort: please specify just one revision | 344 abort: please specify just one revision |
| 345 [255] | 345 [255] |
| 346 | 346 |