Mercurial > hg
annotate tests/test-transplant.out @ 4213:3be4785f8994
tags: add --remove
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 14 Mar 2007 19:13:04 -0500 |
| parents | 889f7e74a0d9 |
| children | ebf1a05f6479 |
| rev | line source |
|---|---|
| 3714 | 1 adding r1 |
| 2 adding r2 | |
| 3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 4 adding b1 | |
| 5 adding b2 | |
| 6 adding b3 | |
| 7 4 b3 | |
| 8 3 b2 | |
| 9 2 0:17ab29e464c6 b1 | |
| 10 1 r2 | |
| 11 0 r1 | |
| 12 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 13 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 14 % rebase b onto r1 | |
| 15 applying 37a1297eb21b | |
| 16 37a1297eb21b transplanted to e234d668f844 | |
| 17 applying 722f4667af76 | |
| 18 722f4667af76 transplanted to 539f377d78df | |
| 19 applying a53251cdf717 | |
| 20 a53251cdf717 transplanted to ffd6818a3975 | |
| 21 7 b3 | |
| 22 6 b2 | |
| 23 5 1:d11e3596cc1a b1 | |
| 24 4 b3 | |
| 25 3 b2 | |
| 26 2 0:17ab29e464c6 b1 | |
| 27 1 r2 | |
| 28 0 r1 | |
| 29 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 30 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 31 % rebase b onto r1, skipping b2 | |
| 32 applying 37a1297eb21b | |
| 33 37a1297eb21b transplanted to e234d668f844 | |
| 34 applying a53251cdf717 | |
| 35 a53251cdf717 transplanted to 7275fda4d04f | |
| 36 6 b3 | |
| 37 5 1:d11e3596cc1a b1 | |
| 38 4 b3 | |
| 39 3 b2 | |
| 40 2 0:17ab29e464c6 b1 | |
| 41 1 r2 | |
| 42 0 r1 | |
| 43 % remote transplant | |
| 44 requesting all changes | |
| 45 adding changesets | |
| 46 adding manifests | |
| 47 adding file changes | |
| 48 added 2 changesets with 2 changes to 2 files | |
| 49 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 50 searching for changes | |
| 51 applying 37a1297eb21b | |
| 52 37a1297eb21b transplanted to c19cf0ccb069 | |
| 53 applying a53251cdf717 | |
| 54 a53251cdf717 transplanted to f7fe5bf98525 | |
| 55 3 b3 | |
| 56 (transplanted from a53251cdf717679d1907b289f991534be05c997a) | |
| 57 2 b1 | |
| 58 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) | |
| 59 1 r2 | |
| 60 0 r1 | |
| 61 % skip previous transplants | |
| 62 searching for changes | |
| 63 applying 722f4667af76 | |
| 64 722f4667af76 transplanted to 47156cd86c0b | |
| 65 4 b2 | |
| 66 3 b3 | |
| 67 (transplanted from a53251cdf717679d1907b289f991534be05c997a) | |
| 68 2 b1 | |
| 69 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) | |
| 70 1 r2 | |
| 71 0 r1 | |
| 72 % skip local changes transplanted to the source | |
| 73 adding b4 | |
| 74 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 75 searching for changes | |
| 76 applying 4333daefcb15 | |
| 77 4333daefcb15 transplanted to 5f42c04e07cc | |
|
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
78 % transplant --continue |
|
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
79 adding foo |
|
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
80 adding toremove |
|
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
81 adding added |
|
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
82 removing toremove |
|
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
83 adding bar |
|
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
84 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
85 applying a1e30dd1b8e7 |
|
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
86 foo |
|
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
87 Hunk #1 FAILED at 1. |
|
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
88 1 out of 1 hunk FAILED -- saving rejects to file foo.rej |
|
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
89 patch command failed: exited with status 1 |
|
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
90 abort: Fix up the merge and run hg transplant --continue |
|
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
91 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
92 applying a1e30dd1b8e7 |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
93 foo |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
94 Hunk #1 FAILED at 1. |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
95 1 out of 1 hunk FAILED -- saving rejects to file foo.rej |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
96 patch command failed: exited with status 1 |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
97 abort: Fix up the merge and run hg transplant --continue |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
98 a1e30dd1b8e7 transplanted as f1563cf27039 |
|
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
99 skipping already applied revision 1:a1e30dd1b8e7 |
|
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
100 applying 1739ac5f6139 |
|
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
101 1739ac5f6139 transplanted to d649c221319f |
|
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
102 applying 0282d5fbbe02 |
|
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
103 0282d5fbbe02 transplanted to 77418277ccb3 |
|
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
104 added |
|
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
105 bar |
|
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
106 foo |