Show More
@@ -1387,7 +1387,7 b' def bundle(ui, repo, fname, dest=None, *' | |||||
1387 | # Packed bundles are a pseudo bundle format for now. |
|
1387 | # Packed bundles are a pseudo bundle format for now. | |
1388 | if cgversion == 's1': |
|
1388 | if cgversion == 's1': | |
1389 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), |
|
1389 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), | |
1390 |
hint=_(' |
|
1390 | hint=_("use 'hg debugcreatestreamclonebundle'")) | |
1391 |
|
1391 | |||
1392 | if opts.get('all'): |
|
1392 | if opts.get('all'): | |
1393 | if dest: |
|
1393 | if dest: | |
@@ -4236,7 +4236,7 b' def _dograft(ui, repo, *revs, **opts):' | |||||
4236 | extra += ' --date %s' % opts['date'] |
|
4236 | extra += ' --date %s' % opts['date'] | |
4237 | if opts.get('log'): |
|
4237 | if opts.get('log'): | |
4238 | extra += ' --log' |
|
4238 | extra += ' --log' | |
4239 |
hint=_(' |
|
4239 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra | |
4240 | raise error.Abort( |
|
4240 | raise error.Abort( | |
4241 | _("unresolved conflicts, can't continue"), |
|
4241 | _("unresolved conflicts, can't continue"), | |
4242 | hint=hint) |
|
4242 | hint=hint) | |
@@ -6319,7 +6319,7 b' def revert(ui, repo, *pats, **opts):' | |||||
6319 | if not opts.get('rev') and p2 != nullid: |
|
6319 | if not opts.get('rev') and p2 != nullid: | |
6320 | # revert after merge is a trap for new users (issue2915) |
|
6320 | # revert after merge is a trap for new users (issue2915) | |
6321 | raise error.Abort(_('uncommitted merge with no revision specified'), |
|
6321 | raise error.Abort(_('uncommitted merge with no revision specified'), | |
6322 |
hint=_('use " |
|
6322 | hint=_("use 'hg update' or see 'hg help revert'")) | |
6323 |
|
6323 | |||
6324 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
6324 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
6325 |
|
6325 |
@@ -260,7 +260,7 b' Cannot produce streaming clone bundles w' | |||||
260 |
|
260 | |||
261 | $ hg -R test bundle -t packed1 packed.hg |
|
261 | $ hg -R test bundle -t packed1 packed.hg | |
262 | abort: packed bundles cannot be produced by "hg bundle" |
|
262 | abort: packed bundles cannot be produced by "hg bundle" | |
263 |
(use |
|
263 | (use 'hg debugcreatestreamclonebundle') | |
264 | [255] |
|
264 | [255] | |
265 |
|
265 | |||
266 | packed1 is produced properly |
|
266 | packed1 is produced properly |
General Comments 0
You need to be logged in to leave comments.
Login now