tests: add a missing "cd .." to test-rebase-inmemory.t stable
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 04 Dec 2018 08:55:48 -0800
branchstable
changeset 53580 9b1d5eea07f9be73df44f70a65cbc511f8063f81
parent 53579 884321cd26c30d4ea7a693b467c41270e612cde8
child 53581 d10b1dc134316c13c637232fc52389aa24319e12
push id1079
push usergszorc@mozilla.com
push dateMon, 10 Dec 2018 19:44:59 +0000
tests: add a missing "cd .." to test-rebase-inmemory.t Differential Revision: https://phab.mercurial-scm.org/D5367
tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -51,16 +51,17 @@ Rebase a simple DAG:
   o  1: 02952614a83d 'd'
   |
   @  0: b173517d0057 'a'
   
   $ hg cat -r 3 b
   b (no-eol)
   $ hg cat -r 2 c
   c (no-eol)
+  $ cd ..
 
 Case 2:
   $ hg init repo2
   $ cd repo2
   $ hg debugdrawdag <<'EOS'
   > c b
   > |/
   > d
@@ -174,17 +175,17 @@ Test reporting of path conflicts
   | o  2: 09c044d2cb43 'd'
   | |
   | o  1: fc055c3b4d33 'b'
   |/
   o  0: b173517d0057 'a'
   
   $ hg rebase -r . -d 2
   rebasing 4:daf7dfc139cb "a/a" (tip)
-  saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
+  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
 
   $ hg tglog
   @  4: c6ad37a4f250 'a/a'
   |
   | o  3: 844a7de3e617 'c'
   | |
   o |  2: 09c044d2cb43 'd'
   | |
@@ -215,17 +216,17 @@ Test reporting of path conflicts
   o |  2: 09c044d2cb43 'd'
   | |
   o |  1: fc055c3b4d33 'b'
   |/
   o  0: b173517d0057 'a'
   
   $ hg rebase -r . -d 5
   rebasing 7:855e9797387e "added a back!" (tip)
-  saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg
+  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg
 
   $ hg tglog
   @  7: bb3f02be2688 'added a back!'
   |
   | o  6: d14530e5e3e6 'added bar'
   | |
   o |  5: 9b94b9373deb 'added foo'
   |/
@@ -439,17 +440,17 @@ In-memory rebase that fails due to merge
   rebasing 2:177f92b77385 "c"
   rebasing 3:055a42cdd887 "d"
   rebasing 4:e860deea161a "e"
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg rebase --abort
-  saved backup bundle to $TESTTMP/repo1/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
+  saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
   rebase aborted
 
 Retrying without in-memory merge won't lose working copy changes
   $ cd ..
   $ hg clone repo3 repo3-dirty -q
   $ cd repo3-dirty
   $ echo dirty > a
   $ hg rebase -s 2 -d 7