Patchwork D2015: tests: in test-split.t, save a "clean" copy of pre-split repo for later use

login
register
mail settings
Submitter phabricator
Date Feb. 2, 2018, 11:40 p.m.
Message ID <differential-rev-PHID-DREV-i3oupngxbuhdpfqro4lq-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27243/
State Superseded
Headers show

Comments

phabricator - Feb. 2, 2018, 11:40 p.m.
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-split.t

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: mercurial-devel
phabricator - June 19, 2018, 8:50 p.m.
martinvonz accepted this revision.
martinvonz added a comment.
This revision is now accepted and ready to land.


  I intend to make split preserve the phase (with an different implementation from https://phab.mercurial-scm.org/D2016), so I'll queue this. Thanks!

REPOSITORY
  rHG Mercurial

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

To: spectral, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel
phabricator - July 2, 2018, 12:06 p.m.
sangeet259 added a comment.


  I am sorry I accidentally pushed here :/

REPOSITORY
  rHG Mercurial

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

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

Patch

diff --git a/tests/test-split.t b/tests/test-split.t
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -90,10 +90,11 @@ 
   $ hg forget dirty
   $ rm dirty
 
-Split a head
+Make a clean directory for future tests to build off of
 
-  $ cp -R . ../b
-  $ cp -R . ../c
+  $ cp -R . ../clean
+
+Split a head
 
   $ hg bookmark r3
 
@@ -262,6 +263,7 @@ 
 
 Split a head while working parent is not that head
 
+  $ cp -R $TESTTMP/clean $TESTTMP/b
   $ cd $TESTTMP/b
 
   $ hg up 0 -q
@@ -301,6 +303,7 @@ 
 
 Split a non-head
 
+  $ cp -R $TESTTMP/clean $TESTTMP/c
   $ cd $TESTTMP/c
   $ echo d > d
   $ hg ci -m d1 -A d