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

BUG - "Merge all..." fails where command line svn merge works as expected

From: Jeffery R. Price <jefferyrprice_at_gmail.com>
Date: Thu, 10 Jul 2008 08:53:28 -0400

Stefan wrote:
> Date: Wed, 09 Jul 2008 22:15:38 +0200
> From: Stefan Küng <tortoisesvn_at_gmail.com>
> Content-Type: multipart/signed; micalg=pgp-sha1;
> protocol="application/pgp-signature";
> boundary="------------enig5B6AB7132C85F7DE6549A621"
> Subject: BUG - "Merge all..." fails where command line svn merge
> works as expected
> Jeffery R. Price wrote:
> > I would like to merge all changes from the trunk into my branch
> working
> > copy using the "Merge all..." feature of 1.5.
> >
> > In the top-level of the working copy I shift-right-click and select
> > "TortoiseSVN -> Merge all..." I accept the default options (Merge
> depth
> > = Working copy and only Compare whitespaces selected). I then
> press the
> > Merge button. The result is nothing:
> > --------------------------------------------------------------------
> > Command Getting required information...
> > Command Merging http://myserver/svn/mytrunk into c:\src\mybranch,
> > respecting ancestry.
> > Finished!
> > --------------------------------------------------------------------
> >
> > What I expect to happen is what actually happens if I use the
> command line:
> > --------------------------------------------------------------------
> > C:\src\mybranch>svn merge http://myserver/svn/mytrunk
> That command is not the same as "merge all": you've specified an URL.
> To do the same with TSVN, use the merge dialog, revision range. Then
> enter the URL and leave the revisions-to-merge box empty.
> The 'merge all' in TSVN actually does an
> svn merge --reintegrate
> Stefan
> --

Thanks for the tip, I appreciate the help!

Considering what you said, I would have to say the documentation for
TortoiseSVN 1.5.0 is definitely misleading (outright mistaken?) about
this feature. In Section 5.19.8. Merge All Changes (pp. 98-99) the
guide states:
If you want to merge all changes from trunk to the branch you are
currently working on, then you can use the TortoiseSVN → Merge all...
from the extended context menu (hold down the Shift key while you
right click on the file). ...
Considering I actually did want to "merge all changes from trunk to
the branch" I was currently working on, that sounded like the ideal
feature. :-) Furthermore, the TSVN results window indicated that the
command was indeed merging from my trunk URL into my working copy. If
I understand you correctly, the TSVN Merge all command actually does
the exact opposite, though, and merges (reintegrates) all changes from
the branch back into the trunk.

Received on 2008-07-10 14:59:00 CEST

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

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