Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:05:45 -0500] rev 14901
revset: add formatspec convenience query builder
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:04:57 -0500] rev 14900
revset: allow bypassing alias expansion
For internal usage of revset queries, we don't want aliases breaking things.
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 17:51:45 -0500] rev 14899
merge with stable
Kevin Bullock <kbullock@ringworld.org> [Tue, 19 Jul 2011 13:43:53 -0500] rev 14898
subrepo: don't commit in subrepo if it's clean
If a subrepo has changed relative to the outer repo's substate, but the
subrepo itself is clean, we don't need to commit in the subrepo.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Mon, 18 Jul 2011 22:58:21 +0200] rev 14897
rebase: block collapse with keepbranches on multiple named branches (issue2112)
Collapse and keepbranches should be blocked when there is more than
one named branch on the branch that's going to be rebased.
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 14:19:04 -0500] rev 14896
merge with stable
Alexander Krauss <krauss@in.tum.de> [Sun, 17 Jul 2011 00:36:43 +0200] rev 14895
hbisect: do not assume that min(good) is an ancestor of min(bad)
The included test used to report "inconsistent state", which is
incorrect. While this situation cannot occur when the user sticks to
the suggested bisect sequence. However, adding more consistent
good/bad information to the bisect state should be tolerated as well.