Mercurial > hg
view tests/test-transplant.out @ 3728:a32b4b930079
merge: remove unused match logic from findcopies
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Nov 2006 17:36:33 -0600 |
parents | 752884db5037 |
children | 889f7e74a0d9 |
line wrap: on
line source
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 % transplant --continue adding foo adding toremove adding added removing toremove adding bar 2 files updated, 0 files merged, 2 files removed, 0 files unresolved applying a1e30dd1b8e7 foo Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file foo.rej patch command failed: exited with status 1 abort: Fix up the merge and run hg transplant --continue a1e30dd1b8e7 transplanted as e6d0b5145568 applying 1739ac5f6139 1739ac5f6139 transplanted to 48f780141a79 applying 0282d5fbbe02 0282d5fbbe02 transplanted to 821d17b1a3ed added bar foo