Mercurial > hg
comparison mercurial/commands.py @ 15463:e1005da0ae04 stable
graft: mark a string for translation
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Tue, 08 Nov 2011 21:31:39 +0100 |
| parents | c519cd8f0169 |
| children | f520c9616db5 dc9fb7015d7f |
comparison
equal
deleted
inserted
replaced
| 15462:2b1ec74c961f | 15463:e1005da0ae04 |
|---|---|
| 2559 if not revs: | 2559 if not revs: |
| 2560 return -1 | 2560 return -1 |
| 2561 | 2561 |
| 2562 for pos, ctx in enumerate(repo.set("%ld", revs)): | 2562 for pos, ctx in enumerate(repo.set("%ld", revs)): |
| 2563 current = repo['.'] | 2563 current = repo['.'] |
| 2564 ui.status('grafting revision %s\n' % ctx.rev()) | 2564 ui.status(_('grafting revision %s\n') % ctx.rev()) |
| 2565 | 2565 |
| 2566 # we don't merge the first commit when continuing | 2566 # we don't merge the first commit when continuing |
| 2567 if not cont: | 2567 if not cont: |
| 2568 # perform the graft merge with p1(rev) as 'ancestor' | 2568 # perform the graft merge with p1(rev) as 'ancestor' |
| 2569 try: | 2569 try: |