Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 30230:46a0203dfb89 stable
tests: run "cwd was removed" test only if cwd can actually be removed
On some platforms, cwd can't be removed. In which case, util.unlinkpath()
continues with no error since the failure of directory removal isn't critical.
So it doesn't make sense to run the test added by 90a6c18a7c1d on those
platforms. OTOH, we need to run the test in test-rebase-scenario-global.t
since the repository is referenced after that.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Wed, 26 Oct 2016 22:50:06 +0900 |
parents | 90a6c18a7c1d |
children | 318a24b52eeb |
comparison
equal
deleted
inserted
replaced
30229:69ffbbe73dd0 | 30230:46a0203dfb89 |
---|---|
754 $ mkdir subdir | 754 $ mkdir subdir |
755 $ cd subdir | 755 $ cd subdir |
756 $ touch subfile | 756 $ touch subfile |
757 $ hg add subfile | 757 $ hg add subfile |
758 $ hg commit -m 'second source with subdir' | 758 $ hg commit -m 'second source with subdir' |
759 #if rmcwd | |
759 $ hg rebase -b . -d 1 --traceback | 760 $ hg rebase -b . -d 1 --traceback |
760 rebasing 2:779a07b1b7a0 "first source commit" | 761 rebasing 2:779a07b1b7a0 "first source commit" |
761 current directory was removed | 762 current directory was removed |
762 (consider changing to repo root: $TESTTMP/cwd-vanish) | 763 (consider changing to repo root: $TESTTMP/cwd-vanish) |
763 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) | 764 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) |
764 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) | 765 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) |
766 #else | |
767 $ hg rebase -b . -d 1 --traceback | |
768 rebasing 2:779a07b1b7a0 "first source commit" | |
769 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) | |
770 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) | |
771 #endif | |
765 | 772 |
766 Test that rebase is done in topo order (issue5370) | 773 Test that rebase is done in topo order (issue5370) |
767 | 774 |
768 $ cd .. | 775 $ cd .. |
769 $ hg init order | 776 $ hg init order |