merge with crew-stable

This commit is contained in:
Thomas Arendsen Hein 2013-02-11 16:57:46 +01:00
commit dddbcf14eb

View File

@ -2106,7 +2106,9 @@ def debugknown(ui, repopath, *ids, **opts):
] + commitopts2, ] + commitopts2,
_('[OBSOLETED [REPLACEMENT] [REPL... ]')) _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
def debugobsolete(ui, repo, precursor=None, *successors, **opts): def debugobsolete(ui, repo, precursor=None, *successors, **opts):
"""create arbitrary obsolete marker""" """create arbitrary obsolete marker
With no arguments it it display the list obsolescence marker."""
def parsenodeid(s): def parsenodeid(s):
try: try:
# We do not use revsingle/revrange functions here to accept # We do not use revsingle/revrange functions here to accept