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

RE: Re: Merge - I only want my changes merged

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Wed, 28 Dec 2011 12:33:45 -0500

> Well we have our folder structure for database objects. And so there are
> hundreds of stored procedures that developers work on for several projects
> from the Parent folder called Procedures. if I was working on one procedure
> locally, I was not expecting the Merge to go and pick up 20 more files that
> other developers changed in the repository on the parent folder. I am merging
> to Trunk from my development folder so I was only looking for my set of
> changes. Hmmm..that is strange.

Did you possibly merge backward?

If you want to merge changes from YOUR branch to the trunk where all the shared code is then you should be right clicking on the "trunk" and choose merge then selecting your branch in the "from" box. Perhaps you did it the other way around? Unless you meant to do a reintegration and you didn't select that option?

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2901808

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-31 02:43:54 CET

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