Tue, 17 Mar 2009 13:46:53 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 17 Mar 2009 13:46:53 -0500] rev 7856
Merge with stable
Tue, 17 Mar 2009 11:34:40 -0400 regression test for issue1552
Benjamin Pollack <benjamin@bitquabit.com> [Tue, 17 Mar 2009 11:34:40 -0400] rev 7855
regression test for issue1552 Ensures that fetch correctly infers what to merge when pulling a repository with inactive branches.
Tue, 17 Mar 2009 11:47:40 -0400 fetch: do not count inactive branches when inferring a merge
Benjamin Pollack <benjamin@bitquabit.com> [Tue, 17 Mar 2009 11:47:40 -0400] rev 7854
fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.
(0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip