Martin Geisler <mg@aragost.com> [Fri, 05 Nov 2010 15:35:39 +0100] rev 12931
merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Fri, 05 Nov 2010 15:13:22 +0100] rev 12930
subrepo: test & fix svn subrepo removal
Kevin Bullock <kbullock@ringworld.org> [Thu, 04 Nov 2010 17:09:00 -0500] rev 12929
revsets: let parents() return parents of working dir
This patch makes the 'set' argument to revset function parents() optional.
Like p1() and p2(), if no argument is given, returns the parent(s) of the
working directory.
Morally equivalent to 'p1()+p2()', as expected.
Kevin Bullock <kbullock@ringworld.org> [Thu, 04 Nov 2010 16:59:03 -0500] rev 12928
revsets: let p1() and p2() return parents of working dir
This patch makes the 'set' argument to revset functions p1() and p2()
optional. If no argument is given, p1() and p2() return the first or second
parent of the working directory.
If the working directory is not an in-progress merge (no 2nd parent), p2()
returns the empty set. For a checkout of the null changeset, both p1() and
p2() return the empty set.