Giovanni Bajo wrote: > On 06/07/2007 7.15, Raman Gupta wrote: > >> No, the point of removing the properties before the merge is to >> completely avoid a property conflict -- since they are removed the >> source branch can have absolutely anything. This works because merge >> --force is being called. > > Are you absolutely positive that "merge --force" is required to avoid > the conflict? If so, it should be documented.
No, I wasn't clear -- the merge --force is only required because the working copy is in a modified state. I didn't add that -- it was already there because of the frequent need for merging multiple ranges. But it works for the modification of the property values too. Cheers, Raman _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
