Mercurial > hg
changeset 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 | ad230d56db25 |
| files | tests/test-rebase-scenario-global.t |
| diffstat | 1 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.t Sat Jul 08 14:10:10 2017 -0400 +++ b/tests/test-rebase-scenario-global.t Sat Jul 08 14:15:01 2017 -0400 @@ -762,19 +762,13 @@ $ touch subfile $ hg add subfile $ hg commit -m 'second source with subdir' -#if rmcwd + $ hg rebase -b . -d 1 --traceback rebasing 2:779a07b1b7a0 "first source commit" - current directory was removed - (consider changing to repo root: $TESTTMP/cwd-vanish) + current directory was removed (rmcwd !) + (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !) rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob) -#else - $ hg rebase -b . -d 1 --traceback - rebasing 2:779a07b1b7a0 "first source commit" - rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) - saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg (glob) -#endif Get back to the root of cwd-vanish. Note that even though `cd ..` works on most systems, it does not work on FreeBSD 10, so we use an