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

Re: Merge not working ?

From: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: 2006-07-18 13:30:45 CEST

On Tuesday 18 July 2006 13:01, Ferry Barrois wrote:
> Hi All,
>
> I see the following problem :
>
> Create repository with branches,tags,trunk using import
> Import file a.c into trunk
> modify a.c
> create branch of a.c to /branches/test1
> switch working copy to /branches/test1
> edit a.c in test1
> commit changes
>
> Now I want to merge the changes from a.c in test1 to the trunk.
> So :
>
> I create new directory and checkout trunk
> Select Merge : from /braches/test1 to /trunk in working copy dir

This should be:
from: /trunk
to: /branches/test1

you want to merge the delta between trunk (old state) and /branches/test1
(new state) into trunk.
Have a look at the unified diff which gets created if you call "unified
diff" in the merge dialog.

The dry run possibly shows an updated file because editing of a.c in test1
consisted of a new line. Since you turned the two URLs around the delta
changed to removing a line which was never there in the first place. Thus
the file was not modified.

Instead of merging the delta of trunk@HEAD and branches/test1@HEAD you might
actually want to merge the delta between revisionX@branches/test1 and
revisionY@branches/test1 into trunk.
Please have a look at
http://tortoisesvn.sourceforge.net/docs/nightly/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-1
vs.
http://tortoisesvn.sourceforge.net/docs/nightly/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-2

If this doesn't help then please be more specific about how you created the
branches (in the working copy or in the repo browser) and mention the exact
changes you made to the file.

Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jul 18 13:31:50 2006

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