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

Re: Merge - I only want my changes merged

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 22 Dec 2011 21:45:52 +0100

On 22.12.2011 21:42, Carlos Tijerina wrote:
> It should only pick up changes in that folder. But somehow it goes to
> the repository and gets a totally different file that was added or
> changed by someone else. I don't even have that file listed in my
> local C drive. We used SVN 1.6.10.

First, please update. If you don't want to update to 1.7.x, the last
release for the 1.6.x branch was version 1.6.16
https://sourceforge.net/projects/tortoisesvn/files/1.6.16/

Then: if you don't have the files in your working copies, why are they
missing before the merge?
If the files are part of the revision you merge, then of course they get
added to your working copy.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2899200
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-22 21:46:04 CET

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