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

Re: BUG: Record Only Merge modified Working Copy

From: object01 <object01_at_gmail.com>
Date: Wed, 27 Aug 2008 08:31:24 -0700 (PDT)

Stefan Küng wrote:
>
> Fixed in r13400.
>
> Stefan
>

I'm still having this issue in 1.5.2 (build 13595, 2008/07/31) on Windows
Vista SP1. I'm trying to perform a reintegrate merge to sync a branch with
the trunk (reintegrate FROM trunk TO branch).

Despite checking "Only record the merge", TortoiseSVN modifies the working
copy located at P:\myWcs\branch\subfolder.

The action log reads roughly as follows (sensitive bits trimmed):

8/27/2008 - 10:24:01 AM
Command : Reintegrate merge
svn://mySvnServer.com/trunk/subfolder into P:\myWcs\branch\subfolder
Merging differences between repository urls : P:\myWcs\branch\subfolder
...
[lots of conflicts, some additions]
...
Finished! :

-- 
View this message in context: http://www.nabble.com/BUG%3A-Record-Only-Merge-modified-Working-Copy-tp18225002p19183511.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-27 17:31:34 CEST

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