Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-transplant.out @ 3726:752884db5037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: recover added/removed files after failed application
author Brendan Cully <brendan@kublai.com>
date Thu, 30 Nov 2006 13:51:58 -0800
parents ea523d6f5f1a
children 889f7e74a0d9
comparison
equal deleted inserted replaced
3725:ccc7a9eb0e5e 3726:752884db5037
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 78 % transplant --continue
79 adding foo 79 adding foo
80 adding toremove
81 adding added
82 removing toremove
80 adding bar 83 adding bar
81 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 84 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
82 applying c029d661401c 85 applying a1e30dd1b8e7
83 foo 86 foo
84 Hunk #1 FAILED at 1. 87 Hunk #1 FAILED at 1.
85 1 out of 1 hunk FAILED -- saving rejects to file foo.rej 88 1 out of 1 hunk FAILED -- saving rejects to file foo.rej
86 patch command failed: exited with status 1 89 patch command failed: exited with status 1
87 abort: Fix up the merge and run hg transplant --continue 90 abort: Fix up the merge and run hg transplant --continue
88 c029d661401c transplanted as 1b09cda4cf1b 91 a1e30dd1b8e7 transplanted as e6d0b5145568
89 applying 67f0722fdc4f 92 applying 1739ac5f6139
90 67f0722fdc4f transplanted to faa04033bb41 93 1739ac5f6139 transplanted to 48f780141a79
91 applying 84c5126bd0d2 94 applying 0282d5fbbe02
92 84c5126bd0d2 transplanted to b35f4019ccc9 95 0282d5fbbe02 transplanted to 821d17b1a3ed
96 added
97 bar
98 foo