[PATCH 1 of 2] transplant: failing test for --log with same parents
Levi Bard
taktaktaktaktaktaktaktaktaktak at gmail.com
Fri May 11 10:29:53 CDT 2012
# HG changeset patch
# User Levi Bard <levi at unity3d.com>
# Date 1336749908 -7200
# Node ID 253c456e9ba5a7e3dea677dc2c87bb6afdec9a42
# Parent ddd4996740c785cc187766249977ea3ece8c17ab
transplant: failing test for --log with same parents
diff -r ddd4996740c7 -r 253c456e9ba5 tests/test-transplant.t
--- a/tests/test-transplant.t Tue May 08 12:05:45 2012 -0500
+++ b/tests/test-transplant.t Fri May 11 17:25:08 2012 +0200
@@ -120,7 +120,25 @@
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
More information about the Mercurial-devel
mailing list