Mon, 07 Mar 2011 12:03:54 -0500 subrepo: don't crash when git repo is missing stable
Eric Eisner <ede@mit.edu> [Mon, 07 Mar 2011 12:03:54 -0500] rev 13553
subrepo: don't crash when git repo is missing
Mon, 07 Mar 2011 15:44:43 -0600 ancestor: rewrite to deal with crossed linkrevs (issue2682) stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:44:43 -0600] rev 13552
ancestor: rewrite to deal with crossed linkrevs (issue2682) This version is about 10% slower, possibly because it visits some revisions in a different topological order than what's in the revlog.
Sun, 06 Mar 2011 11:30:57 +0100 hgcia: accept "queued." xmlrpc return as success stable
Georg Brandl <georg@python.org> [Sun, 06 Mar 2011 11:30:57 +0100] rev 13551
hgcia: accept "queued." xmlrpc return as success
Mon, 07 Mar 2011 15:03:10 -0600 merge: back out single-parent fast-forward merge stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:03:10 -0600] rev 13550
merge: back out single-parent fast-forward merge This backs out changeset: 13158:9e7e24052745 user: Mads Kiilerich <mads@kiilerich.com> date: Tue Dec 07 03:29:21 2010 +0100 summary: merge: fast-forward merge with descendant Before named branches, the invariants were: a) "merges" always have two parents b) p1 is not linearly related to p2 Adding named branches made (b) problematic, so the above patch was introduced, which fixed (b) but broke (a). After discussion, we decided that the invariants should be: a) "merges" always have two parents b) p1 is not linearly related to p2 OR p1 and p2 are on different branches
Sat, 05 Mar 2011 16:34:59 -0600 merge: drop resolve state for mergers with identical contents (issue2680) stable
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13549
merge: drop resolve state for mergers with identical contents (issue2680)
Sun, 06 Mar 2011 22:13:36 +0100 merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:13:36 +0100] rev 13548
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip