Mercurial > evolve
comparison tests/test-topic-rebase.t @ 5666:e5d91fd1f319
tests: update with more detailed exit codes
CORE-TEST-OUTPUT-UPDATE: 21733e8c924f
CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0
CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c
CORE-TEST-OUTPUT-UPDATE: ebee234d952a
CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60
CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b
CORE-TEST-OUTPUT-UPDATE: f96fa4de5055
CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 19 Nov 2020 08:28:45 -0800 |
| parents | c2fab88e6d60 |
| children | 61d2f1cf90f0 |
comparison
equal
deleted
inserted
replaced
| 5665:dd9dba7c1d00 | 5666:e5d91fd1f319 |
|---|---|
| 126 rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" | 126 rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" |
| 127 merging file | 127 merging file |
| 128 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') | 128 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
| 129 switching to topic myotherfeature | 129 switching to topic myotherfeature |
| 130 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 130 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 131 [1] | 131 [240] |
| 132 | 132 |
| 133 Resolve the conflict | 133 Resolve the conflict |
| 134 $ echo A2 > file | 134 $ echo A2 > file |
| 135 $ echo B >> file | 135 $ echo B >> file |
| 136 $ hg resolve -m | 136 $ hg resolve -m |