Show More
@@ -1773,7 +1773,7 b' class queue(object):' | |||
|
1773 | 1773 | else: |
|
1774 | 1774 | series.append(l) |
|
1775 | 1775 | if datastart is None: |
|
1776 |
self.ui.warn(_(" |
|
|
1776 | self.ui.warn(_("no saved patch data found\n")) | |
|
1777 | 1777 | return 1 |
|
1778 | 1778 | self.ui.warn(_("restoring status: %s\n") % lines[0]) |
|
1779 | 1779 | self.fullseries = series |
@@ -1800,7 +1800,7 b' class queue(object):' | |||
|
1800 | 1800 | self.ui.status(_("updating queue directory\n")) |
|
1801 | 1801 | r = self.qrepo() |
|
1802 | 1802 | if not r: |
|
1803 |
self.ui.warn(_(" |
|
|
1803 | self.ui.warn(_("unable to load queue repository\n")) | |
|
1804 | 1804 | return 1 |
|
1805 | 1805 | hg.clean(r, qpp[0]) |
|
1806 | 1806 | |
@@ -2514,7 +2514,7 b' def fold(ui, repo, *files, **opts):' | |||
|
2514 | 2514 | for f in files: |
|
2515 | 2515 | p = q.lookup(f) |
|
2516 | 2516 | if p in patches or p == parent: |
|
2517 |
ui.warn(_(' |
|
|
2517 | ui.warn(_('skipping already folded patch %s\n') % p) | |
|
2518 | 2518 | if q.isapplied(p): |
|
2519 | 2519 | raise util.Abort(_('qfold cannot fold already applied patch %s') |
|
2520 | 2520 | % p) |
@@ -3420,7 +3420,7 b' def reposetup(ui, repo):' | |||
|
3420 | 3420 | tags = result[0] |
|
3421 | 3421 | for patch in mqtags: |
|
3422 | 3422 | if patch[1] in tags: |
|
3423 |
self.ui.warn(_(' |
|
|
3423 | self.ui.warn(_('tag %s overrides mq patch of the same ' | |
|
3424 | 3424 | 'name\n') % patch[1]) |
|
3425 | 3425 | else: |
|
3426 | 3426 | tags[patch[1]] = patch[0] |
General Comments 0
You need to be logged in to leave comments.
Login now