On 10/13/2009 12:09 PM, Dave Korn wrote:
Alas that doesn't prevent the conflicts, it just makes them "was removed on
trunk" rather than "was changed on trunk"! Well, that's what happened to me
anyway. It's a shame that svn doesn't have separate --accept types for files
and for properties, th
Richard Henderson wrote:
> Managing branches with svnmerge is nice and friendly. Certainly much
> easier than doing it by hand. However, when it comes time to integrate
> that branch into mainline, one must use more caution.
>
> If you use svnmerge on your branch, and then integrate the branch t
On 10/13/09 11:34, Richard Henderson wrote:
Managing branches with svnmerge is nice and friendly. Certainly much
easier than doing it by hand. However, when it comes time to
integrate that branch into mainline, one must use more caution.
If you use svnmerge on your branch, and then integrate
