# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1281522618 -7200
# Node ID 3cdd6fdc3d9e2a719381348646a6364e656c5c90
# Parent  a8614c5a5e9a312c7f4d956e9b19af5314f48ce6# Parent  2b7a75ca691322f2d25c55f62335228f47e91ae2
Merge with stable

diff -r a8614c5a5e9a -r 3cdd6fdc3d9e hgext/convert/subversion.py
--- 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
diff -r a8614c5a5e9a -r 3cdd6fdc3d9e hgext/graphlog.py
--- 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("_", "-"))
diff -r a8614c5a5e9a -r 3cdd6fdc3d9e mercurial/commands.py
--- 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,