[Svnmerge] [PATCH] Handle transitive merging property conflicts for both merged/blocked revs

Giovanni Bajo rasky at develer.com
Thu Jul 5 22:42:48 PDT 2007


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.
-- 
Giovanni Bajo




More information about the Svnmerge mailing list