Mercurial > hg-stable

comparison tests/test-transplant.out @ 6336:4b0c9c674707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warn about new heads on commit (issue842)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 21 Mar 2008 11:06:02 +0100
parents 27414950abf5
children 0750f11152fe
comparison
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707
1 adding r1 1 adding r1
2 adding r2 2 adding r2
3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 adding b1 4 adding b1
5 created new head
5 adding b2 6 adding b2
6 adding b3 7 adding b3
7 4 b3 8 4 b3
8 3 b2 9 3 b2
9 2 0:17ab29e464c6 b1 10 2 0:17ab29e464c6 b1
98 adding toremove 99 adding toremove
99 adding added 100 adding added
100 removing toremove 101 removing toremove
101 adding bar 102 adding bar
102 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 103 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
104 created new head
103 applying a1e30dd1b8e7 105 applying a1e30dd1b8e7
104 patching file foo 106 patching file foo
105 Hunk #1 FAILED at 0 107 Hunk #1 FAILED at 0
106 1 out of 1 hunk FAILED -- saving rejects to file foo.rej 108 1 out of 1 hunk FAILED -- saving rejects to file foo.rej
107 patch failed to apply 109 patch failed to apply