[Svnmerge] questions about merge tracking

[Archie Cobbs]

Giovanni Bajo wrote:
>>What you are referring to is option #1. Option #2 would mean doing
>>something like this: Let M be the maximum merged revision number so far.
>>Each time we "svnmerge merge", if we are merging a maximal revision
>>N > M, then find all the "phantom" revisions between N and M and merge
>>them as well.
>>I kind of like #2 better because it seems more "proactive" or something.
>>We could use a similar "svn log -r M:N ..." trick to detect the phantom
>>revisions. Then the "by induction" statement would hold true.
> 
> The actual update of the svn merge property will have to be done as part of
> the "svnmerge merge", because "svnmerge avail" is not supposed to modify the
> working copy. Thus, I believe we should actually implement both #1 and #2.
> #1 will make things easier for the user because it will show clearly which
> are the available revisions, while #2 will take care of the actual updating
> the property.

You're right.. both #1 and #2 would be required. I like this idea.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com