##// END OF EJS Templates
Merge with stable
Martin Geisler -
r11780:3cdd6fdc merge default
parent child Browse files
Show More
@@ -1157,4 +1157,5 b' class svn_sink(converter_sink, commandli'
1157 os.unlink(messagefile)
1157 os.unlink(messagefile)
1158
1158
1159 def puttags(self, tags):
1159 def puttags(self, tags):
1160 self.ui.warn(_('XXX TAGS NOT IMPLEMENTED YET\n'))
1160 self.ui.warn(_('writing Subversion tags is not yet implemented\n'))
1161 return None, None
@@ -217,8 +217,8 b' def get_revs(repo, rev_opt):'
217
217
218 def check_unsupported_flags(opts):
218 def check_unsupported_flags(opts):
219 for op in ["follow", "follow_first", "date", "copies", "keyword", "remove",
219 for op in ["follow", "follow_first", "date", "copies", "keyword", "remove",
220 "only_merges", "user", "only_branch", "prune", "newest_first",
220 "only_merges", "user", "branch", "only_branch", "prune",
221 "no_merges", "include", "exclude"]:
221 "newest_first", "no_merges", "include", "exclude"]:
222 if op in opts and opts[op]:
222 if op in opts and opts[op]:
223 raise util.Abort(_("--graph option is incompatible with --%s")
223 raise util.Abort(_("--graph option is incompatible with --%s")
224 % op.replace("_", "-"))
224 % op.replace("_", "-"))
@@ -4177,7 +4177,7 b' table = {'
4177 _('show only heads which are descendants of REV'), _('REV')),
4177 _('show only heads which are descendants of REV'), _('REV')),
4178 ('t', 'topo', False, _('show topological heads only')),
4178 ('t', 'topo', False, _('show topological heads only')),
4179 ('a', 'active', False,
4179 ('a', 'active', False,
4180 _('show active branchheads only [DEPRECATED]')),
4180 _('show active branchheads only (DEPRECATED)')),
4181 ('c', 'closed', False,
4181 ('c', 'closed', False,
4182 _('show normal and closed branch heads')),
4182 _('show normal and closed branch heads')),
4183 ] + templateopts,
4183 ] + templateopts,
General Comments 0
You need to be logged in to leave comments. Login now