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

[TSVN] Question/Suggestion for merging a branch to trunk

From: Marc Demers <marcd_at_neocell-factory.com>
Date: 2005-07-13 19:05:42 CEST

I'm using TortoiseSVN 1.2.0 b3602

I had previously create a branch while have modification in my
working copy. This seems to have committed the changes upon the
branch creation (revision X for our discution). Now I want to
merge back that branch to the trunk and the last revision committed
in the branch is revision Y for our discution.

So in my trunk working copy I do a merge and select my branch
into the From: combo box. I then select the revision range I
want to merge back (X to Y). This fills in automatically the From
Revision: X-1 and the To Revision: Y. The "Use From: URL" options
is checked.

When I do the merge or a dry run, an error shows up:

Error REPORT request failed on
'/svn/myrepo/!svn/bc/X-1/branches/mybranch'
Error '/svn/myrepo/!svn/bc/X-1/branches/mybranch'path not found

What I need to do in order to make it work is to select the trunk
as my From URL because revision X-1 does not exists in the branch.

Previous versions of TortoiseSVN didn't require to do that and
it does not seems to be intuitive (to my point of view).

Also, using Subversion in command line, I could perform the
following operation which seems to be more straigh forward:

svn merge -r X-1:Y MyRepo/branches/MyBranch

So would it be simpler and complete to have the Merge dialog having
only the following entries?

From: URL (branch to merge changes from)
Start Revision:
   O HEAD Revision
   O Revision [ ] Show Log
End Revision:
   O HEAD Revision
   O Revision [ ] Show Log

Marc
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jul 13 19:14:46 2005

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