[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:27:38 +0100

On 21.12.2011 22:11, Carlos Tijerina wrote:
> Hello, I am working on my files checked out locally to my C drive. I
> am working on my own file. I select the Trunk and Scripts folder and
> right click to select the Merge tool. My From URL is the Devline
> Scripts folder. When I click the Merge, the tool is picking up other
> developers files from the repository and mine as well. SVN Merge
> used to only pick up my changes only when I click the Merge Tool.
> Keep in mind that I'm working on my own file separate from others
> files. Does anyone know why this is happening?

* what version of TSVN are you using?
* are you sure it merges the changes and not just modifies the
properties (svn:mergeinfo) on those other files?
* did you right-click on your file or the parent folder? if the parent
folder, then all entries in that folder are merged

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=2899194
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-22 21:27:53 CET

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