Re: Is merging branches reliable?

On Sat, May 06, 2006 at 09:40:25AM +0200, Zsolt wrote:
> 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?

Because you asked for it. When you do your merge you must supply the
revision span you want to merge. If you ask for the differences from
1-may to 6-may of your branch you will get nothing and the merge will
not alter the a.java in your trunk. OTOH if you ask for the differences
from the initial addition of a.java to 6-may you will get a.java as it
looks in your branch on 6-may and that will be merged into your trunk.

Read section 4 of the Subversion book, it should explain these things.

        http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html

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