Show More
@@ -2652,7 +2652,7 b' def save(ui, repo, **opts):' | |||||
2652 | ret = q.save(repo, msg=message) |
|
2652 | ret = q.save(repo, msg=message) | |
2653 | if ret: |
|
2653 | if ret: | |
2654 | return ret |
|
2654 | return ret | |
2655 | q.savedirty() |
|
2655 | q.savedirty() # save to .hg/patches before copying | |
2656 | if opts.get('copy'): |
|
2656 | if opts.get('copy'): | |
2657 | path = q.path |
|
2657 | path = q.path | |
2658 | if opts.get('name'): |
|
2658 | if opts.get('name'): | |
@@ -2669,10 +2669,9 b' def save(ui, repo, **opts):' | |||||
2669 | ui.warn(_("copy %s to %s\n") % (path, newpath)) |
|
2669 | ui.warn(_("copy %s to %s\n") % (path, newpath)) | |
2670 | util.copyfiles(path, newpath) |
|
2670 | util.copyfiles(path, newpath) | |
2671 | if opts.get('empty'): |
|
2671 | if opts.get('empty'): | |
2672 | try: |
|
2672 | del q.applied[:] | |
2673 | os.unlink(q.join(q.statuspath)) |
|
2673 | q.applieddirty = True | |
2674 | except: |
|
2674 | q.savedirty() | |
2675 | pass |
|
|||
2676 | return 0 |
|
2675 | return 0 | |
2677 |
|
2676 | |||
2678 | @command("strip", |
|
2677 | @command("strip", |
@@ -245,7 +245,6 b'' | |||||
245 | hgext/mq.py:0: |
|
245 | hgext/mq.py:0: | |
246 | > except: |
|
246 | > except: | |
247 | warning: naked except clause |
|
247 | warning: naked except clause | |
248 | warning: naked except clause |
|
|||
249 | hgext/mq.py:0: |
|
248 | hgext/mq.py:0: | |
250 | > ui.write("mq: %s\n" % ', '.join(m)) |
|
249 | > ui.write("mq: %s\n" % ', '.join(m)) | |
251 | warning: unwrapped ui message |
|
250 | warning: unwrapped ui message |
General Comments 0
You need to be logged in to leave comments.
Login now