SVN Merge question

Hi,

I have read the subversion book, but I can't figure out a couple of
questions I have that is related to svn merge.

Here is my scenario:

I have a trunk and a branch taken from that trunk and develop on both of
them.

a) On my trunk I have moved a file (foo.c) into another directory and
kept its original name.

On my branch I have updated foo.c . What will happen when I merge my
branch changes back to the trunk?

Will the merge recognise that the file has been moved to a new location
and apply the branch changes of that file to the new location , or will
t just add foo.c to its original location on the trunk?

b)Scenario is same as a) but when I moved foo.c on trunk to the new
directory, I renamed it to foobar.c

What will happen when I merge my branch? Will the merge apply the
changes on foo.c from the branch to foobar.c or will it mark foobar.c
for deletion and add foo.c ?

Kind Regards

Lenin Varsamis.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-21 16:08:42 CET