[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: Dale McCoy <dalestan_at_gmail.com>
Date: Thu, 22 Dec 2011 19:46:55 -0500

Please quote some context in your replies.

On Thu, Dec 22, 2011 at 16:13, Carlos Tijerina
<carlos.f.tijerina_at_jpmchase.com> wrote:
> 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.

If you only want to merge changes to mybranch/Procedures/file-32, then
right-click on file-32, not on Procedures or mybranch.
If you only want to merge revision 31337, then right-click on any of
those three (but pick one and be consistent), and select only revision

If you want to merge something else, then pick the variant of the
above that most closely matches your desired behaviour, and repeat as
necessary. Alternatively, merge some superset of the desired merge,
and revert the files you do not want merged.

> Hmmm..that is strange.

No, it is not strange. What is strange is that you think it's possible
or reasonable to merge only your own changes. Imagine that developer A
creates a new procedure in revision 1023 and you add a call to it in
revision 1058. If you then try to merge revision 1058, without merging
revision 1023, your merge, even if it's turns out to be
copy-source-to-destination, created a broken source, because it calls
a procedure that doesn't exist.

Dale McCoy


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-23 01:47:00 CET

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