No,
you have a file a.java in the main trunk for example with last modification
6-may-2006 and you have a file on a branch with the modification 1-may-2006
(with the original content of a.java from the trunk). Why should be copied
this old file back to the main trunk?
Zsolt
>-----Original Message-----
>From: Jacob Atzen [mailto:jacob@aub.dk]
>Sent: Saturday, May 06, 2006 9:14 AM
>To: users@subversion.tigris.org
>Subject: Re: Is merging branches reliable?
>
>On Sat, May 06, 2006 at 09:05:30AM +0200, Zsolt wrote:
>> I have merged a branch to the main trunk and lot of old files from the
>> branch overwrote the file in the main trunk.
>
>Is this not the expected behaviour of a merge? That changes from the
>source are applied to the target?
>
>--
>Cheers,
>- Jacob Atzen
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat May 6 09:41:14 2006