Mercurial > hg

comparison tests/test-graft.t @ 16600:b54f3c502e63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: remark on empty graft
author Matt Mackall <mpm@selenic.com>
date Sun, 06 May 2012 14:15:17 -0500
parents eab9119c5dee
children 0c98820be15c
comparison
equal deleted inserted replaced
16599:4b73f4ba27ca 16600:b54f3c502e63
130 overwrite: False, partial: False 130 overwrite: False, partial: False
131 ancestor: 68795b066622, local: d2e44c99fd3f+, remote: 5d205f8b35b6 131 ancestor: 68795b066622, local: d2e44c99fd3f+, remote: 5d205f8b35b6
132 b: local copied/moved to a -> m 132 b: local copied/moved to a -> m
133 preserving b for resolve of b 133 preserving b for resolve of b
134 updating: b 1/1 files (100.00%) 134 updating: b 1/1 files (100.00%)
135 graft for revision 1 is empty
135 grafting revision 5 136 grafting revision 5
136 searching for copies back to rev 1 137 searching for copies back to rev 1
137 resolving manifests 138 resolving manifests
138 overwrite: False, partial: False 139 overwrite: False, partial: False
139 ancestor: 4c60f11aa304, local: d2e44c99fd3f+, remote: 97f8bfe72746 140 ancestor: 4c60f11aa304, local: d2e44c99fd3f+, remote: 97f8bfe72746