Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-transplant.out @ 3758:889f7e74a0d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: log source node when recovering too.
author Brendan Cully <brendan@kublai.com>
date Fri, 01 Dec 2006 15:00:33 -0800
parents 752884db5037
children ebf1a05f6479
comparison
equal deleted inserted replaced
3757:faed44bab17b 3758:889f7e74a0d9
86 foo 86 foo
87 Hunk #1 FAILED at 1. 87 Hunk #1 FAILED at 1.
88 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
89 patch command failed: exited with status 1 89 patch command failed: exited with status 1
90 abort: Fix up the merge and run hg transplant --continue 90 abort: Fix up the merge and run hg transplant --continue
91 a1e30dd1b8e7 transplanted as e6d0b5145568 91 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
92 applying a1e30dd1b8e7
93 foo
94 Hunk #1 FAILED at 1.
95 1 out of 1 hunk FAILED -- saving rejects to file foo.rej
96 patch command failed: exited with status 1
97 abort: Fix up the merge and run hg transplant --continue
98 a1e30dd1b8e7 transplanted as f1563cf27039
99 skipping already applied revision 1:a1e30dd1b8e7
92 applying 1739ac5f6139 100 applying 1739ac5f6139
93 1739ac5f6139 transplanted to 48f780141a79 101 1739ac5f6139 transplanted to d649c221319f
94 applying 0282d5fbbe02 102 applying 0282d5fbbe02
95 0282d5fbbe02 transplanted to 821d17b1a3ed 103 0282d5fbbe02 transplanted to 77418277ccb3
96 added 104 added
97 bar 105 bar
98 foo 106 foo