Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master

1 files changed, 9 insertions, 232 deletions

diff --git a/tests/test-transplant.t b/tests/test-transplant.t
index 36a61f7..d2545f3 100644
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -1,5 +1,3 @@
-  $ "$TESTDIR/hghave" serve || exit 80
-
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > transplant=
@@ -83,87 +81,6 @@ test tranplanted keyword
   1 
   0 
 
-test destination() revset predicate with a transplant of a transplant; new
-clone so subsequent rollback isn't affected
-  $ hg clone -q . ../destination
-  $ cd ../destination
-  $ hg up -Cq 0
-  $ hg branch -q b4
-  $ hg ci -qm "b4"
-  $ hg transplant 7
-  applying ffd6818a3975
-  ffd6818a3975 transplanted to 502236fa76bb
-
-
-  $ hg log -r 'destination()'
-  changeset:   5:e234d668f844
-  parent:      1:d11e3596cc1a
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     b1
-  
-  changeset:   6:539f377d78df
-  user:        test
-  date:        Thu Jan 01 00:00:01 1970 +0000
-  summary:     b2
-  
-  changeset:   7:ffd6818a3975
-  user:        test
-  date:        Thu Jan 01 00:00:02 1970 +0000
-  summary:     b3
-  
-  changeset:   9:502236fa76bb
-  branch:      b4
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:02 1970 +0000
-  summary:     b3
-  
-  $ hg log -r 'destination(a53251cdf717)'
-  changeset:   7:ffd6818a3975
-  user:        test
-  date:        Thu Jan 01 00:00:02 1970 +0000
-  summary:     b3
-  
-  changeset:   9:502236fa76bb
-  branch:      b4
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:02 1970 +0000
-  summary:     b3
-  
-
-test subset parameter in reverse order
-  $ hg log -r 'reverse(all()) and destination(a53251cdf717)'
-  changeset:   9:502236fa76bb
-  branch:      b4
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:02 1970 +0000
-  summary:     b3
-  
-  changeset:   7:ffd6818a3975
-  user:        test
-  date:        Thu Jan 01 00:00:02 1970 +0000
-  summary:     b3
-  
-
-back to the original dir
-  $ cd ../rebase
-
-rollback the transplant
-  $ hg rollback
-  repository tip rolled back to revision 4 (undo transplant)
-  working directory now based on revision 1
-  $ hg tip -q
-  4:a53251cdf717
-  $ hg parents -q
-  1:d11e3596cc1a
-  $ hg status
-  ? b1
-  ? b2
-  ? b3
-
   $ hg clone ../t ../prune
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -188,25 +105,7 @@ rebase b onto r1, skipping b2
   1  r2
   0  r1
 
-test same-parent transplant with --log
 
-  $ hg clone -r 1 ../t ../sameparent
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd ../sameparent
-  $ hg transplant --log -s ../prune 5
-  searching for changes
-  applying e234d668f844
-  e234d668f844 transplanted to e07aea8ecf9c
-  $ hg log --template '{rev} {parents} {desc}\n'
-  2  b1
-  (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170)
-  1  r2
-  0  r1
 remote transplant
 
   $ hg clone -r 1 ../t ../remote
@@ -298,9 +197,7 @@ transplant --continue
   > baz
   > EOF
   $ echo toremove > toremove
-  $ echo baz > baz
   $ hg ci -Amfoo
-  adding baz
   adding foo
   adding toremove
   $ cat <<EOF > foo
@@ -314,22 +211,17 @@ transplant --continue
   adding added
   removing toremove
   $ echo bar > bar
-  $ cat > baz <<EOF
-  > before baz
-  > baz
-  > after baz
-  > EOF
   $ hg ci -Ambar
   adding bar
   $ echo bar2 >> bar
   $ hg ci -mbar2
   $ hg up 0
-  3 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo foobar > foo
   $ hg ci -mfoobar
   created new head
   $ hg transplant 1:3
-  applying 46ae92138f3c
+  applying a1e30dd1b8e7
   patching file foo
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
@@ -343,7 +235,7 @@ transplant -c shouldn't use an old changeset
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm added
   $ hg transplant 1
-  applying 46ae92138f3c
+  applying a1e30dd1b8e7
   patching file foo
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
@@ -351,41 +243,17 @@ transplant -c shouldn't use an old changeset
   abort: fix up the merge and run hg transplant --continue
   [255]
   $ hg transplant --continue
-  46ae92138f3c transplanted as 9159dada197d
+  a1e30dd1b8e7 transplanted as f1563cf27039
   $ hg transplant 1:3
-  skipping already applied revision 1:46ae92138f3c
-  applying 9d6d6b5a8275
-  9d6d6b5a8275 transplanted to 2d17a10c922f
-  applying 1dab759070cf
-  1dab759070cf transplanted to e06a69927eb0
+  skipping already applied revision 1:a1e30dd1b8e7
+  applying 1739ac5f6139
+  1739ac5f6139 transplanted to d649c221319f
+  applying 0282d5fbbe02
+  0282d5fbbe02 transplanted to 77418277ccb3
   $ hg locate
   added
   bar
-  baz
   foo
-
-test multiple revisions and --continue
-
-  $ hg up -qC 0
-  $ echo bazbaz > baz
-  $ hg ci -Am anotherbaz baz
-  created new head
-  $ hg transplant 1:3
-  applying 46ae92138f3c
-  46ae92138f3c transplanted to 1024233ea0ba
-  applying 9d6d6b5a8275
-  patching file baz
-  Hunk #1 FAILED at 0
-  1 out of 1 hunks FAILED -- saving rejects to file baz.rej
-  patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
-  [255]
-  $ echo fixed > baz
-  $ hg transplant --continue
-  9d6d6b5a8275 transplanted as d80c49962290
-  applying 1dab759070cf
-  1dab759070cf transplanted to aa0ffe6bd5ae
-
   $ cd ..
 
 Issue1111: Test transplant --merge
@@ -424,8 +292,6 @@ test transplant into empty repository
   $ cd ..
 
 
-#if unix-permissions system-sh
-
 test filter
 
   $ hg init filter
@@ -511,10 +377,6 @@ test transplant with filter handles invalid changelog
   filtering * (glob)
   abort: filter corrupted changeset (no user or date)
   [255]
-  $ cd ..
-
-#endif
-
 
 test with a win32ext like setup (differing EOLs)
 
@@ -547,88 +409,3 @@ test with a win32ext like setup (differing EOLs)
   a\r (esc)
   b\r (esc)
   $ cd ..
-
-test transplant with merge changeset is skipped
-
-  $ hg init merge1a
-  $ cd merge1a
-  $ echo a > a
-  $ hg ci -Am a
-  adding a
-  $ hg branch b
-  marked working directory as branch b
-  (branches are permanent and global, did you want a bookmark?)
-  $ hg ci -m branchb
-  $ echo b > b
-  $ hg ci -Am b
-  adding b
-  $ hg update default
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg merge b
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-  $ hg ci -m mergeb
-  $ cd ..
-
-  $ hg init merge1b
-  $ cd merge1b
-  $ hg transplant -s ../merge1a tip
-  $ cd ..
-
-test transplant with merge changeset accepts --parent
-
-  $ hg init merge2a
-  $ cd merge2a
-  $ echo a > a
-  $ hg ci -Am a
-  adding a
-  $ hg branch b
-  marked working directory as branch b
-  (branches are permanent and global, did you want a bookmark?)
-  $ hg ci -m branchb
-  $ echo b > b
-  $ hg ci -Am b
-  adding b
-  $ hg update default
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg merge b
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-  $ hg ci -m mergeb
-  $ cd ..
-
-  $ hg init merge2b
-  $ cd merge2b
-  $ hg transplant -s ../merge2a --parent 0 tip
-  applying be9f9b39483f
-  be9f9b39483f transplanted to 9959e51f94d1
-  $ cd ..
-
-test transplanting a patch turning into a no-op
-
-  $ hg init binarysource
-  $ cd binarysource
-  $ echo a > a
-  $ hg ci -Am adda a
-  >>> file('b', 'wb').write('\0b1')
-  $ hg ci -Am addb b
-  >>> file('b', 'wb').write('\0b2')
-  $ hg ci -m changeb b
-  $ cd ..
-
-  $ hg clone -r0 binarysource binarydest
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  updating to branch default
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd binarydest
-  $ cp ../binarysource/b b
-  $ hg ci -Am addb2 b
-  $ hg transplant -s ../binarysource 2
-  searching for changes
-  applying 7a7d57e15850
-  skipping emptied changeset 7a7d57e15850
-  $ cd ..
-