Mercurial > hg

comparison tests/test-graft.t @ 16992:55e7f352b1d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: allow -r to specify revisions
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 20 Jun 2012 17:02:43 +0200
parents f2719b387380
children fba17a64fa49
comparison
equal deleted inserted replaced
16991:1aae34f109fd 16992:55e7f352b1d3
50 Can't graft ancestor: 50 Can't graft ancestor:
51 51
52 $ hg graft 1 2 52 $ hg graft 1 2
53 skipping ancestor revision 1 53 skipping ancestor revision 1
54 skipping ancestor revision 2 54 skipping ancestor revision 2
55 [255]
56
57 Specify revisions with -r:
58
59 $ hg graft -r 1 -r 2
60 skipping ancestor revision 1
61 skipping ancestor revision 2
62 [255]
63
64 $ hg graft -r 1 2
65 skipping ancestor revision 2
66 skipping ancestor revision 1
55 [255] 67 [255]
56 68
57 Can't graft with dirty wd: 69 Can't graft with dirty wd:
58 70
59 $ hg up -q 0 71 $ hg up -q 0
177 189
178 $ hg graft -c 6 190 $ hg graft -c 6
179 abort: can't specify --continue and revisions 191 abort: can't specify --continue and revisions
180 [255] 192 [255]
181 193
194 $ hg graft -c -r 6
195 abort: can't specify --continue and revisions
196 [255]
197
182 Continue for real, clobber usernames 198 Continue for real, clobber usernames
183 199
184 $ hg graft -c -U 200 $ hg graft -c -U
185 grafting revision 4 201 grafting revision 4
186 grafting revision 3 202 grafting revision 3