##// END OF EJS Templates
mq: document repo.mq.qparents...
Pierre-Yves David -
r19816:d5ec50e8 default
parent child Browse files
Show More
@@ -628,6 +628,14 b' class queue(object):'
628 return (0, n)
628 return (0, n)
629
629
630 def qparents(self, repo, rev=None):
630 def qparents(self, repo, rev=None):
631 """return the mq handled parent or p1
632
633 In some case where mq get himself in being the parent of a merge the
634 paappropriate parent may be p2.
635 (eg: an in progress merge started with mq disabled)
636
637 If no parent are managed by mq, p1 is returned.
638 """
631 if rev is None:
639 if rev is None:
632 (p1, p2) = repo.dirstate.parents()
640 (p1, p2) = repo.dirstate.parents()
633 if p2 == nullid:
641 if p2 == nullid:
General Comments 0
You need to be logged in to leave comments. Login now