[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: Wed, 9 Jul 2008 16:09:33 -0400

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
--- Merging r8 through r11 into '.':
U mydir1\mymodfile1
U mydir2\mymodfile2
A mydir3\mynewfile
  U mydir4
--------------------------------------------------------------------

Using TortoiseSVN 1.5.0, Build 13316
Using svn 1.5.0 (r316999)
Server is VisualSVN 1.5 (Apache/2.2.8 (Win32) DAV/2 SVN/1.5.0)

The repository is a brand-new import into 1.5.

Thanks!
Jeff

---------------------------------------------------------------------
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-09 22:13:46 CEST

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