Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-transplant.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents 27414950abf5
children
comparison
equal deleted inserted replaced
5343:26692d08c2f9 5344:cc34be74eeec
99 adding added 99 adding added
100 removing toremove 100 removing toremove
101 adding bar 101 adding bar
102 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 102 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
103 applying a1e30dd1b8e7 103 applying a1e30dd1b8e7
104 foo 104 patching file foo
105 Hunk #1 FAILED at 1. 105 Hunk #1 FAILED at 0
106 1 out of 1 hunk FAILED -- saving rejects to file foo.rej 106 1 out of 1 hunk FAILED -- saving rejects to file foo.rej
107 patch command failed: exited with status 1 107 patch failed to apply
108 abort: Fix up the merge and run hg transplant --continue 108 abort: Fix up the merge and run hg transplant --continue
109 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 109 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
110 applying a1e30dd1b8e7 110 applying a1e30dd1b8e7
111 foo 111 patching file foo
112 Hunk #1 FAILED at 1. 112 Hunk #1 FAILED at 0
113 1 out of 1 hunk FAILED -- saving rejects to file foo.rej 113 1 out of 1 hunk FAILED -- saving rejects to file foo.rej
114 patch command failed: exited with status 1 114 patch failed to apply
115 abort: Fix up the merge and run hg transplant --continue 115 abort: Fix up the merge and run hg transplant --continue
116 a1e30dd1b8e7 transplanted as f1563cf27039 116 a1e30dd1b8e7 transplanted as f1563cf27039
117 skipping already applied revision 1:a1e30dd1b8e7 117 skipping already applied revision 1:a1e30dd1b8e7
118 applying 1739ac5f6139 118 applying 1739ac5f6139
119 1739ac5f6139 transplanted to d649c221319f 119 1739ac5f6139 transplanted to d649c221319f