equal
deleted
inserted
replaced
156 |
156 |
157 set up some more complex changes to shelve |
157 set up some more complex changes to shelve |
158 |
158 |
159 $ echo a >> a/a |
159 $ echo a >> a/a |
160 $ hg mv b b.rename |
160 $ hg mv b b.rename |
161 moving b/b to b.rename/b (glob) |
161 moving b/b to b.rename/b |
162 $ hg cp c c.copy |
162 $ hg cp c c.copy |
163 $ hg status -C |
163 $ hg status -C |
164 M a/a |
164 M a/a |
165 A b.rename/b |
165 A b.rename/b |
166 b/b |
166 b/b |
350 ? a/a.orig |
350 ? a/a.orig |
351 # The repository is in an unfinished *unshelve* state. |
351 # The repository is in an unfinished *unshelve* state. |
352 |
352 |
353 # Unresolved merge conflicts: |
353 # Unresolved merge conflicts: |
354 # |
354 # |
355 # a/a (glob) |
355 # a/a |
356 # |
356 # |
357 # To mark files as resolved: hg resolve --mark FILE |
357 # To mark files as resolved: hg resolve --mark FILE |
358 |
358 |
359 # To continue: hg unshelve --continue |
359 # To continue: hg unshelve --continue |
360 # To abort: hg unshelve --abort |
360 # To abort: hg unshelve --abort |
641 shelved as default |
641 shelved as default |
642 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
642 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
643 $ hg rebase -d 1 --config extensions.rebase= |
643 $ hg rebase -d 1 --config extensions.rebase= |
644 rebasing 2:323bfa07f744 "xyz" (tip) |
644 rebasing 2:323bfa07f744 "xyz" (tip) |
645 merging x |
645 merging x |
646 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg (glob) |
646 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg |
647 $ hg unshelve |
647 $ hg unshelve |
648 unshelving change 'default' |
648 unshelving change 'default' |
649 rebasing shelved changes |
649 rebasing shelved changes |
650 rebasing 4:82a0d7d6ba61 "changes to: xyz" (tip) |
650 rebasing 4:82a0d7d6ba61 "changes to: xyz" (tip) |
651 $ hg status |
651 $ hg status |
897 |
897 |
898 Test that resolving all conflicts in one direction (so that the rebase |
898 Test that resolving all conflicts in one direction (so that the rebase |
899 is a no-op), works (issue4398) |
899 is a no-op), works (issue4398) |
900 |
900 |
901 $ hg revert -a -r . |
901 $ hg revert -a -r . |
902 reverting a/a (glob) |
902 reverting a/a |
903 $ hg resolve -m a/a |
903 $ hg resolve -m a/a |
904 (no more unresolved files) |
904 (no more unresolved files) |
905 continue: hg unshelve --continue |
905 continue: hg unshelve --continue |
906 $ hg unshelve -c |
906 $ hg unshelve -c |
907 rebasing 5:e42a7da90865 "changes to: second" (tip) |
907 rebasing 5:e42a7da90865 "changes to: second" (tip) |