Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 33338:ad124b3208fd
test-rebase: conditionalize output instead of tests
This should help prevent breakage like was fixed in the last patch.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 08 Jul 2017 14:15:01 -0400 |
parents | de324547c751 |
children | 6c1a9fd8361b b5d7e7d5c573 |
comparison
equal
deleted
inserted
replaced
33337:de324547c751 | 33338:ad124b3208fd |
---|---|
760 $ mkdir subdir | 760 $ mkdir subdir |
761 $ cd subdir | 761 $ cd subdir |
762 $ touch subfile | 762 $ touch subfile |
763 $ hg add subfile | 763 $ hg add subfile |
764 $ hg commit -m 'second source with subdir' | 764 $ hg commit -m 'second source with subdir' |
765 #if rmcwd | 765 |
766 $ hg rebase -b . -d 1 --traceback | 766 $ hg rebase -b . -d 1 --traceback |
767 rebasing 2:779a07b1b7a0 "first source commit" | 767 rebasing 2:779a07b1b7a0 "first source commit" |
768 current directory was removed | 768 current directory was removed (rmcwd !) |
769 (consider changing to repo root: $TESTTMP/cwd-vanish) | 769 (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !) |
770 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) | 770 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) |
771 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob) | 771 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob) |
772 #else | |
773 $ hg rebase -b . -d 1 --traceback | |
774 rebasing 2:779a07b1b7a0 "first source commit" | |
775 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) | |
776 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob) | |
777 #endif | |
778 | 772 |
779 Get back to the root of cwd-vanish. Note that even though `cd ..` | 773 Get back to the root of cwd-vanish. Note that even though `cd ..` |
780 works on most systems, it does not work on FreeBSD 10, so we use an | 774 works on most systems, it does not work on FreeBSD 10, so we use an |
781 absolute path to get back to the repository. | 775 absolute path to get back to the repository. |
782 $ cd $TESTTMP | 776 $ cd $TESTTMP |