Tue, 08 Mar 2011 01:21:50 +0100 merge: remove last traces of fastforward merging
Mads Kiilerich <mads@kiilerich.com> [Tue, 08 Mar 2011 01:21:50 +0100] rev 13561
merge: remove last traces of fastforward merging bbc97d419b16 introduced fast-forward branch merging. 66ed92ed115a partly removed it again. The fastforward variable would always be false if branchmerge was false, so the fastforward variable makes no difference and we can remove it completely.
Mon, 07 Mar 2011 23:19:17 +0100 merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:19:17 +0100] rev 13560
merge with stable
Mon, 07 Mar 2011 23:02:04 +0100 subrepo: backout 67fbe566eff1, --force requires svn >= 1.5 stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:02:04 +0100] rev 13559
subrepo: backout 67fbe566eff1, --force requires svn >= 1.5
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip