Patchwork D5367: tests: add a missing "cd .." to test-rebase-inmemory.t

login
register
mail settings
Submitter phabricator
Date Dec. 4, 2018, 10:20 p.m.
Message ID <5f07fe1f911b5c566bee47f99a2a4490@localhost.localdomain>
Download mbox | patch
Permalink /patch/36965/
State Not Applicable
Headers show

Comments

phabricator - Dec. 4, 2018, 10:20 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG9b1d5eea07f9: tests: add a missing &quot;cd ..&quot; to test-rebase-inmemory.t (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5367?vs=12697&id=12702

REVISION DETAIL
  https://phab.mercurial-scm.org/D5367

AFFECTED FILES
  tests/test-rebase-inmemory.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -56,6 +56,7 @@ 
   b (no-eol)
   $ hg cat -r 2 c
   c (no-eol)
+  $ cd ..
 
 Case 2:
   $ hg init repo2
@@ -179,7 +180,7 @@ 
   
   $ 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'
@@ -220,7 +221,7 @@ 
   
   $ 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!'
@@ -444,7 +445,7 @@ 
   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