Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-transplant.out @ 3724:ea523d6f5f1a
transplant: fix --continue; add --continue test
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 30 Nov 2006 11:09:25 -0800 |
parents | 198173f3957c |
children | 752884db5037 |
comparison
equal
deleted
inserted
replaced
3723:c828fca6f38a | 3724:ea523d6f5f1a |
---|---|
73 adding b4 | 73 adding b4 |
74 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 74 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 searching for changes | 75 searching for changes |
76 applying 4333daefcb15 | 76 applying 4333daefcb15 |
77 4333daefcb15 transplanted to 5f42c04e07cc | 77 4333daefcb15 transplanted to 5f42c04e07cc |
78 % transplant --continue | |
79 adding foo | |
80 adding bar | |
81 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
82 applying c029d661401c | |
83 foo | |
84 Hunk #1 FAILED at 1. | |
85 1 out of 1 hunk FAILED -- saving rejects to file foo.rej | |
86 patch command failed: exited with status 1 | |
87 abort: Fix up the merge and run hg transplant --continue | |
88 c029d661401c transplanted as 1b09cda4cf1b | |
89 applying 67f0722fdc4f | |
90 67f0722fdc4f transplanted to faa04033bb41 | |
91 applying 84c5126bd0d2 | |
92 84c5126bd0d2 transplanted to b35f4019ccc9 |