On 1/10/07, Giovanni Bajo <[EMAIL PROTECTED]> wrote: > On 10/01/2007 22.15, Archie Cobbs wrote: > > > For example, suppose a file is changed in rev X and then renamed > > (i.e., copied and deleted) in rev Y. > > > > Then "svn merge --force" of X and Y will cause the changes in revision > > X to be lost, no? > > Absolutely not!
You're right... I had it backwards in my head. The case I had in mind that doesn't work is when you merge Y but NOT X. Then the file will get "renamed" but the newly named version will have the changes of revision X in it, even though you never merged revision X into your branch. But that problem is not related to adding "--force" to "svn merge". Thanks for your analysis of the code. It looks now that it would be safe and the right thing to do to add "--force". +1 from me. -Archie __________________________________________________________________________ Archie Cobbs * CTO, Awarix * http://www.awarix.com _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
