Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-transplant.out @ 3714:198173f3957c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add transplant extension
author Brendan Cully <brendan@kublai.com>
date Mon, 27 Nov 2006 15:13:01 -0800
parents
children ea523d6f5f1a
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-transplant.out
@@ -0,0 +1,77 @@
+adding r1
+adding r2
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+adding b1
+adding b2
+adding b3
+4  b3
+3  b2
+2 0:17ab29e464c6  b1
+1  r2
+0  r1
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 3 files removed, 0 files unresolved
+% rebase b onto r1
+applying 37a1297eb21b
+37a1297eb21b transplanted to e234d668f844
+applying 722f4667af76
+722f4667af76 transplanted to 539f377d78df
+applying a53251cdf717
+a53251cdf717 transplanted to ffd6818a3975
+7  b3
+6  b2
+5 1:d11e3596cc1a  b1
+4  b3
+3  b2
+2 0:17ab29e464c6  b1
+1  r2
+0  r1
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 3 files removed, 0 files unresolved
+% rebase b onto r1, skipping b2
+applying 37a1297eb21b
+37a1297eb21b transplanted to e234d668f844
+applying a53251cdf717
+a53251cdf717 transplanted to 7275fda4d04f
+6  b3
+5 1:d11e3596cc1a  b1
+4  b3
+3  b2
+2 0:17ab29e464c6  b1
+1  r2
+0  r1
+% remote transplant
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 2 changes to 2 files
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+searching for changes
+applying 37a1297eb21b
+37a1297eb21b transplanted to c19cf0ccb069
+applying a53251cdf717
+a53251cdf717 transplanted to f7fe5bf98525
+3  b3
+(transplanted from a53251cdf717679d1907b289f991534be05c997a)
+2  b1
+(transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
+1  r2
+0  r1
+% skip previous transplants
+searching for changes
+applying 722f4667af76
+722f4667af76 transplanted to 47156cd86c0b
+4  b2
+3  b3
+(transplanted from a53251cdf717679d1907b289f991534be05c997a)
+2  b1
+(transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
+1  r2
+0  r1
+% skip local changes transplanted to the source
+adding b4
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+searching for changes
+applying 4333daefcb15
+4333daefcb15 transplanted to 5f42c04e07cc