Submitter | David Schleimer |
---|---|
Date | Dec. 4, 2012, 8:58 p.m. |
Message ID | <7cc8b808bfcb3a282cdc.1354654719@dev010.prn1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/17/ |
State | Accepted |
Commit | 2c2564280900009655d69be3c09e03af3f368d11 |
Headers | show |
Comments
On Tue, 2012-12-04 at 12:58 -0800, David Schleimer wrote: > # HG changeset patch > # User David Schleimer <dschleimer at fb.com> > # Date 1354654458 28800 > # Node ID 7cc8b808bfcb3a282cdcfeacd73a0583efc4b58a > # Parent 5b80a205b9a25ef1f6b292c5ded87a8fc73007ec > graft: explicit current node tracking The first four here are queued for default, thanks.
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2830,8 +2830,8 @@ wlock = repo.wlock() try: + current = repo['.'] for pos, ctx in enumerate(repo.set("%ld", revs)): - current = repo['.'] ui.status(_('grafting revision %s\n') % ctx.rev()) if opts.get('dry_run'): @@ -2883,6 +2883,8 @@ date=date, extra=extra, editor=editor) if node is None: ui.status(_('graft for revision %s is empty\n') % ctx.rev()) + else: + current = repo[node] finally: wlock.release()