[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: SVN Merge question

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: Mon, 21 Jan 2008 19:44:20 -0600

On Jan 21, 2008, at 09:02, Lenin wrote:

> 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 ?

I recommend you try both of these scenarios out in a test repository.
I think you will find that it does not behave very well,
unfortunately, or at least not the way one might want, because
Subversion does not implement "true renames" at this time.

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-22 03:36:56 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.