Show More
@@ -3867,9 +3867,17 b' def graft(ui, repo, *revs, **opts):' | |||
|
3867 | 3867 | # write out state for --continue |
|
3868 | 3868 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
3869 | 3869 | repo.vfs.write('graftstate', ''.join(nodelines)) |
|
3870 | extra = '' | |
|
3871 | if opts.get('user'): | |
|
3872 | extra += ' --user %s' % opts['user'] | |
|
3873 | if opts.get('date'): | |
|
3874 | extra += ' --date %s' % opts['date'] | |
|
3875 | if opts.get('log'): | |
|
3876 | extra += ' --log' | |
|
3877 | hint=_('use hg resolve and hg graft --continue%s') % extra | |
|
3870 | 3878 | raise error.Abort( |
|
3871 | 3879 | _("unresolved conflicts, can't continue"), |
|
3872 |
hint= |
|
|
3880 | hint=hint) | |
|
3873 | 3881 | else: |
|
3874 | 3882 | cont = False |
|
3875 | 3883 |
@@ -138,7 +138,7 b' Graft out of order, skipping a merge and' | |||
|
138 | 138 | grafting 4:9c233e8e184d "4" |
|
139 | 139 | grafting 3:4c60f11aa304 "3" |
|
140 | 140 | |
|
141 |
$ HGEDITOR=cat hg graft 1 5 |
|
|
141 | $ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug | |
|
142 | 142 | skipping ungraftable merge revision 6 |
|
143 | 143 | scanning for duplicate grafts |
|
144 | 144 | skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
@@ -174,6 +174,8 b' Graft out of order, skipping a merge and' | |||
|
174 | 174 | e |
|
175 | 175 | committing manifest |
|
176 | 176 | committing changelog |
|
177 | $ HGEDITOR=cat hg graft 4 3 --log --debug | |
|
178 | scanning for duplicate grafts | |
|
177 | 179 | grafting 4:9c233e8e184d "4" |
|
178 | 180 | searching for copies back to rev 1 |
|
179 | 181 | resolving manifests |
@@ -192,7 +194,7 b' Graft out of order, skipping a merge and' | |||
|
192 | 194 | my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
|
193 | 195 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
194 | 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 | 198 | [255] |
|
197 | 199 | |
|
198 | 200 | Summary should mention graft: |
General Comments 0
You need to be logged in to leave comments.
Login now