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.
Georg Brandl <georg@python.org> [Sun, 06 Mar 2011 11:30:57 +0100] rev 13551
hgcia: accept "queued." xmlrpc return as success
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
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)
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:13:36 +0100] rev 13548
merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:30 +0100] rev 13547
hgweb: fix filelog rss links generation
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:18 +0100] rev 13546
hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)
Mads Kiilerich <mads@kiilerich.com> [Sun, 06 Mar 2011 19:38:00 +0100] rev 13545
merge with stable
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 10:27:07 -0600] rev 13544
cacert: improve error report when web.cacert file does not exist
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 05:56:59 -0600] rev 13543
tests: improve hghave error reporting for missing Py OpenSSL
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:30:39 +0100] rev 13542
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:21:50 +0100] rev 13541
Improve unresolved merge conflicts warning (issue2681)
Suggested by Antoine Pitrou <pitrou@free.fr>
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:38:47 +0100] rev 13540
tests: convert test-serve to new format
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:19:57 +0100] rev 13539
run-tests: handle mixed comment lines in blacklists
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:17:47 +0100] rev 13538
test-doctest: handle unix/windows path discrepancies