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
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-07-09 22:16:01 CEST