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

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

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Sat, 12 Jul 2008 11:35:40 +0100

2008/7/9 Simon Large <simon.tortoisesvn_at_googlemail.com>:
> 2008/7/9 Stefan KŁng <tortoisesvn_at_gmail.com>:
>> 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
>
> I thought we had got rid of 'merge all'. Maybe we should rename it to
> 'Merge reintegrate' ... or get rid anyway as it is available through
> the merge dialog anyway.

I see you now renamed it, and I will update the docs. But reintegrate
merge is not such a common event. In the life of a branch you might do
many sync merges from trunk, but only one reintegrate at the end. So a
more useful menu entry would be a real 'Merge all' which syncs the
branch with all unmerged revisions from its copy-from URL, much the
same as the CLI does.

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-12 12:35:53 CEST

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