Show More
@@ -56,6 +56,7 b' Rebase a simple DAG:' | |||||
56 | b (no-eol) |
|
56 | b (no-eol) | |
57 | $ hg cat -r 2 c |
|
57 | $ hg cat -r 2 c | |
58 | c (no-eol) |
|
58 | c (no-eol) | |
|
59 | $ cd .. | |||
59 |
|
60 | |||
60 | Case 2: |
|
61 | Case 2: | |
61 | $ hg init repo2 |
|
62 | $ hg init repo2 | |
@@ -179,7 +180,7 b' Test reporting of path conflicts' | |||||
179 |
|
180 | |||
180 | $ hg rebase -r . -d 2 |
|
181 | $ hg rebase -r . -d 2 | |
181 | rebasing 4:daf7dfc139cb "a/a" (tip) |
|
182 | rebasing 4:daf7dfc139cb "a/a" (tip) | |
182 |
saved backup bundle to $TESTTMP/repo |
|
183 | saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg | |
183 |
|
184 | |||
184 | $ hg tglog |
|
185 | $ hg tglog | |
185 | @ 4: c6ad37a4f250 'a/a' |
|
186 | @ 4: c6ad37a4f250 'a/a' | |
@@ -220,7 +221,7 b' Test reporting of path conflicts' | |||||
220 |
|
221 | |||
221 | $ hg rebase -r . -d 5 |
|
222 | $ hg rebase -r . -d 5 | |
222 | rebasing 7:855e9797387e "added a back!" (tip) |
|
223 | rebasing 7:855e9797387e "added a back!" (tip) | |
223 |
saved backup bundle to $TESTTMP/repo |
|
224 | saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg | |
224 |
|
225 | |||
225 | $ hg tglog |
|
226 | $ hg tglog | |
226 | @ 7: bb3f02be2688 'added a back!' |
|
227 | @ 7: bb3f02be2688 'added a back!' | |
@@ -444,7 +445,7 b' In-memory rebase that fails due to merge' | |||||
444 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
445 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
445 | [1] |
|
446 | [1] | |
446 | $ hg rebase --abort |
|
447 | $ hg rebase --abort | |
447 |
saved backup bundle to $TESTTMP/repo |
|
448 | saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg | |
448 | rebase aborted |
|
449 | rebase aborted | |
449 |
|
450 | |||
450 | Retrying without in-memory merge won't lose working copy changes |
|
451 | Retrying without in-memory merge won't lose working copy changes |
General Comments 0
You need to be logged in to leave comments.
Login now