##// END OF EJS Templates
test-rebase: conditionalize output instead of tests...
Matt Harbison -
r33338:ad124b32 default
parent child Browse files
Show More
@@ -762,19 +762,13 b' Test that rebase is not confused by $CWD'
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
General Comments 0
You need to be logged in to leave comments. Login now