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

Re: Question about merging

From: Dave Huang <khym_at_azeotrope.org>
Date: Fri, 11 Dec 2009 17:45:58 -0600

On 12/10/2009 4:08 PM, Bob Archer wrote:
> I think if you do a merge, merge from two different trees, then choose FROM the rev where branch1.1 was created and then the head of branch1.1 you will get that. All a merge does is do a diff between the from/to locations and apply that diff to the merge target.. (which in your case would be your branch2.1.

I knew merge is the equivalent of doing a diff and apply, but wasn't really
clear on exactly what gets diffed... so if doing "Merge two different trees"
does a diff between the From and the To, then applies it to the working
copy, don't I want From to be HEAD on branch1 (rather than the rev where
branch1.1 was created), and To to be HEAD on branch1.1? That seems to match
what the TSVN docs say about the "Merge two different trees" option: "In
both the From Revision field and the To Revision field, enter the last
revision number at which the two trees were synchronized. If you are sure
no-one else is making commits you can use the HEAD revision in both cases."

So, I tried doing that, and I think it mostly worked, but a lot of files
were unexpectedly shown as "Updated"--I have no idea why they show up in the
merge, since they haven't been modified between branch1 and branch1.1. It
seems to be harmless though; even though merge shows them as Updated,
they're not actually modified in the WC after the merge is done.

Something that didn't seem to work as I wanted is that files added to
branch1.1 (i.e., files not in branch1, but in branch1.1) did not get added
to my WC; they're listed as "Skipped".

I also got Tree conflicts for directories that did not have any changes
between branch1 and branch1.1, but had been deleted in branch2. Not sure
what that's about either, but not a big deal.

In any case, thanks for the help! :)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-12 00:46:05 CET

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