Re: Odd merge conflicts

On Jan 10, 2005, at 3:37 PM, Scott Palmer wrote:

>
> On Jan 10, 2005, at 4:28 PM, John Schulz wrote:
>
>> Did you ever get your question answered? I've been keeping track on
>> the svn list and haven't seen a concrete resolution. :-)
>
> No, what you see below is all I got. Even if I was off by one, which
> I don't think I am (someone please tell me), I think the merge should
> have been clean for most cases.
>
>

Scott,

Your algorithmic description of "keeping the branch in sync with the
trunk" sounds spot-on. It's exactly the algorithm we're following as
we develop the new locking feature on a branch. And I've even
documented it in the book last weekend:

    http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.4

AFAIK, adding eol-style properties as part of a merge shouldn't create
any problems. It's no different than running 'svn propset' by hand on
your working copy.

In any case, the problem is that your description is purely anecdotal.
Unless you can show us a transcript of the exact commands and results,
there's not much we can do to help.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 10 22:50:47 2005