Re: Is merging branches reliable?

On Sat, May 06, 2006 at 10:33:12AM +0200, Zsolt wrote:
> I'm not sure what you mean but I give you an example.
>
> - 1-may I make a new-branch (testbr) on a trunk. The file a.java was
> modified on 15-apr.
>
> - I modify a.java on the trunk on the 2-may.
>
> - On testbr, a.java IS NOT modified.
>
> - On 4-may I merge testbr to the trunk.
>
> If the a.java testbr overwrites a.java on the trunk it has nothing to do
> with merge. The entire content of the branch overwrite the trunk, the
> version control system is just USELESS.

It really sounds like you're using the system in the wrong way. If
there's no change to a file in the branch then you shouldn't get any
updates to that file when you perform the merge. If you do, then you're
doing the merge in some wrong way.

-- 
Cheers,
- Jacob Atzen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org