Mercurial > hg
changeset 11780:3cdd6fdc3d9e
Merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Wed, 11 Aug 2010 12:30:18 +0200 |
| parents | a8614c5a5e9a (current diff) 2b7a75ca6913 (diff) |
| children | 6f59154fb604 |
| files | mercurial/commands.py |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Thu Jul 15 18:10:05 2010 +0200 +++ b/hgext/convert/subversion.py Wed Aug 11 12:30:18 2010 +0200 @@ -1157,4 +1157,5 @@ os.unlink(messagefile) def puttags(self, tags): - self.ui.warn(_('XXX TAGS NOT IMPLEMENTED YET\n')) + self.ui.warn(_('writing Subversion tags is not yet implemented\n')) + return None, None
--- a/hgext/graphlog.py Thu Jul 15 18:10:05 2010 +0200 +++ b/hgext/graphlog.py Wed Aug 11 12:30:18 2010 +0200 @@ -217,8 +217,8 @@ def check_unsupported_flags(opts): for op in ["follow", "follow_first", "date", "copies", "keyword", "remove", - "only_merges", "user", "only_branch", "prune", "newest_first", - "no_merges", "include", "exclude"]: + "only_merges", "user", "branch", "only_branch", "prune", + "newest_first", "no_merges", "include", "exclude"]: if op in opts and opts[op]: raise util.Abort(_("--graph option is incompatible with --%s") % op.replace("_", "-"))
--- a/mercurial/commands.py Thu Jul 15 18:10:05 2010 +0200 +++ b/mercurial/commands.py Wed Aug 11 12:30:18 2010 +0200 @@ -4177,7 +4177,7 @@ _('show only heads which are descendants of REV'), _('REV')), ('t', 'topo', False, _('show topological heads only')), ('a', 'active', False, - _('show active branchheads only [DEPRECATED]')), + _('show active branchheads only (DEPRECATED)')), ('c', 'closed', False, _('show normal and closed branch heads')), ] + templateopts,