Re: Incidence of criss-cross merges
From: Stefan Fuhrmann <stefan.fuhrmann_at_wandisco.com>
Date: Tue, 17 Jul 2012 10:44:52 +0200
On Fri, Jul 13, 2012 at 7:11 PM, Julian Foad <julianfoad_at_btopenworld.com>wrote:
> As far as I have been able to discover, there is no generally agreed
The last part has been my concern but I think the following
* before merging, bring HEAD of branch into a working state
* catch-up merge from latest known-good rev of "trunk" to "branch"
* consolidate "branch" and bring it to a known-good state
* merge from latest known-good revision R2 "branch" to "trunk"
Ensuring R2 > R1 prevents the criss-cross. R2 does not need
So, merging from "branch" to "trunk" will become harder and
-- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/downloadReceived on 2012-07-17 10:45:26 CEST
This is an archived mail posted to the Subversion Dev mailing list.