Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 15260:be2c67a8bf88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: use status verbosity for reporting grafts
author Matt Mackall <mpm@selenic.com>
date Fri, 14 Oct 2011 15:40:50 -0500
parents dac2edce4e4a
children 460135339d74
comparison
equal deleted inserted replaced
15259:1d1f6dff9364 15260:be2c67a8bf88
2554 if not revs: 2554 if not revs:
2555 return -1 2555 return -1
2556 2556
2557 for pos, ctx in enumerate(repo.set("%ld", revs)): 2557 for pos, ctx in enumerate(repo.set("%ld", revs)):
2558 current = repo['.'] 2558 current = repo['.']
2559 ui.debug('grafting revision %s', ctx.rev()) 2559 ui.status('grafting revision %s', ctx.rev())
2560 2560
2561 # we don't merge the first commit when continuing 2561 # we don't merge the first commit when continuing
2562 if not cont: 2562 if not cont:
2563 # perform the graft merge with p1(rev) as 'ancestor' 2563 # perform the graft merge with p1(rev) as 'ancestor'
2564 try: 2564 try: