Mercurial > hg
comparison tests/test-graft.t @ 27173:8a8f5d71a49a
graft: improve --continue abort message
before, if you ran hg graft --user ... --date ... --log ... revs,
and if it failed, it would suggest "hg graft --continue",
but if you did that, your --user / --date / --log options
were lost, because they were not persisted anywhere...
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 02 Dec 2015 06:33:52 +0000 |
parents | 4d61c847e06c |
children | cdb9493a7e2f |
comparison
equal
deleted
inserted
replaced
27172:4d61c847e06c | 27173:8a8f5d71a49a |
---|---|
136 grafting 1:5d205f8b35b6 "1" | 136 grafting 1:5d205f8b35b6 "1" |
137 grafting 5:97f8bfe72746 "5" | 137 grafting 5:97f8bfe72746 "5" |
138 grafting 4:9c233e8e184d "4" | 138 grafting 4:9c233e8e184d "4" |
139 grafting 3:4c60f11aa304 "3" | 139 grafting 3:4c60f11aa304 "3" |
140 | 140 |
141 $ HGEDITOR=cat hg graft 1 5 4 3 'merge()' 2 --debug | 141 $ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug |
142 skipping ungraftable merge revision 6 | 142 skipping ungraftable merge revision 6 |
143 scanning for duplicate grafts | 143 scanning for duplicate grafts |
144 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) | 144 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
145 grafting 1:5d205f8b35b6 "1" | 145 grafting 1:5d205f8b35b6 "1" |
146 searching for copies back to rev 1 | 146 searching for copies back to rev 1 |
172 b: remote unchanged -> k | 172 b: remote unchanged -> k |
173 committing files: | 173 committing files: |
174 e | 174 e |
175 committing manifest | 175 committing manifest |
176 committing changelog | 176 committing changelog |
177 $ HGEDITOR=cat hg graft 4 3 --log --debug | |
178 scanning for duplicate grafts | |
177 grafting 4:9c233e8e184d "4" | 179 grafting 4:9c233e8e184d "4" |
178 searching for copies back to rev 1 | 180 searching for copies back to rev 1 |
179 resolving manifests | 181 resolving manifests |
180 branchmerge: True, force: True, partial: False | 182 branchmerge: True, force: True, partial: False |
181 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d | 183 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
190 e: versions differ -> m (merge) | 192 e: versions differ -> m (merge) |
191 picked tool ':merge' for e (binary False symlink False changedelete False) | 193 picked tool ':merge' for e (binary False symlink False changedelete False) |
192 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 | 194 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
193 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 195 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
194 abort: unresolved conflicts, can't continue | 196 abort: unresolved conflicts, can't continue |
195 (use hg resolve and hg graft --continue) | 197 (use hg resolve and hg graft --continue --log) |
196 [255] | 198 [255] |
197 | 199 |
198 Summary should mention graft: | 200 Summary should mention graft: |
199 | 201 |
200 $ hg summary |grep graft | 202 $ hg summary |grep graft |