Mercurial > hg

comparison tests/test-transplant.out @ 6952:3fffba1c87d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: avoid naive plural tricks
author Martin Geisler <mg@daimi.au.dk>
date Sun, 31 Aug 2008 16:12:02 +0200
parents 6334569c8caa
children d3fb413667e5
comparison
equal deleted inserted replaced
6951:c8c9ce0ed3ee 6952:3fffba1c87d0
108 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 108 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
109 created new head 109 created new head
110 applying a1e30dd1b8e7 110 applying a1e30dd1b8e7
111 patching file foo 111 patching file foo
112 Hunk #1 FAILED at 0 112 Hunk #1 FAILED at 0
113 1 out of 1 hunk FAILED -- saving rejects to file foo.rej 113 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
114 patch failed to apply 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 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
117 applying a1e30dd1b8e7 117 applying a1e30dd1b8e7
118 patching file foo 118 patching file foo
119 Hunk #1 FAILED at 0 119 Hunk #1 FAILED at 0
120 1 out of 1 hunk FAILED -- saving rejects to file foo.rej 120 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
121 patch failed to apply 121 patch failed to apply
122 abort: Fix up the merge and run hg transplant --continue 122 abort: Fix up the merge and run hg transplant --continue
123 a1e30dd1b8e7 transplanted as f1563cf27039 123 a1e30dd1b8e7 transplanted as f1563cf27039
124 skipping already applied revision 1:a1e30dd1b8e7 124 skipping already applied revision 1:a1e30dd1b8e7
125 applying 1739ac5f6139 125 applying 1739ac5f6139