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

Re: 2-URL merges incorrectly reverse-merge mergeinfo for merge target?

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 18 May 2010 21:34:37 -0400

Stefan Sperling wrote:
> Given the subject line, I guess most of you realised that this mail
> is intended for Paul and any other merge-tracking nerds on this list :)
>
> Attached is a script that shows a merge which removes mergeinfo for
> the merge target for no explicable reason (at least I can't see a
> reason for removing it).

The 2-URL merge algorithm determines if the two URLs ("left" and "right")
are ancestrally related. If so (that is, if there exists a common ancestor
"ancestor"), merge recording is enabled for the merge. The recorded
mergeinfo is as follows:

      the reverse-merge of the diff between "ancestor" and "left"
    + the merge of the diff between "ancestor" and "right"

So let's start with: "Does this match what you see in your scenario?"
(I've not yet read your extensive script or its output yet.)

From there, we can move on to: "Is this expected-but-still-braindead?"

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
Received on 2010-05-19 03:35:07 CEST

This is an archived mail posted to the Subversion Dev mailing list.