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

[TSVN] Merge only cooperated going the wron way

From: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: 2005-01-07 17:43:01 CET

I have a single project containing a trunk and branch.
I have been working on the branch and now want to merge the changes back
into the trunk.
Selecting the Trunk folder, right click Select TortoiseSVN click Merge .
Brings up the Merge dialog OK
So. It says Merge changes into current working copy which points to the URL:
http://192.168.1.20/svn/MyProject/Trunk
which what is desired.

The "from" URL is then set to http://192.168.1.20/svn/MyProject/Branch
The "To" checkbox 'Use "From:" URL is uncheckd.
Just why I would want to use the From URL as the destination I don't
quite fathom.
The "To" URL is set to http://192.168.1.20/svn/MyProject/Trunk

Both to and from revisions buttons are set to "head"

Click OK and get a single line response that says "Updated
C:\Delphi\MyProject\Trunk
Nothing changes, Update draws a blank, Commit ays nothing to commit etc.

If I try the merge the other way, the trunk quite happily overwrites
the branch and it kills off all the recent work on the branch.

Seems odd to me.
I know I haven't generated named folders below trunk and branch but I
don't see that it should matter for the purposes of this simple exercise.

Can anyone point me in the correct direction please?
Peter McNab

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jan 7 17:43:31 2005

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