Re: cvs2git: One possible bug, and two other issues

On Sun, Jan 9, 2011 at 8:21 AM, Michael Haggerty <[email protected]> wrote:
> Hello,
>
> Thanks a lot for your email and the patches.  Now that Xmas chaos is
> getting over I finally had the chance to look at them...

And in the meantime I've had a very busy time with other projects at
work - but now I hope I can use some time on this again ... :-)

> On 01/03/2011 03:48 PM, Anders Pilegaard wrote:
>> ... keyword expansion ...
>
> I think you want 'expanded' rather than 'untouched'. ...

Ok, I'll use that.  I did try however with a very simple repository,
and 'untouched' and 'expanded' gave me the same expansion.  But
'expanded' sounds more like what we want here ...


>> Issue 1 - Branches getting the wrong parent(s)
>> ----------------------------------------------
> ...
> AFAICT your fix will work.  But there might be a simpler way to fix the
> problem.
>
> The following code in CVSFileItems._adjust_branch_parents() is there to
> prevent "circular grafts", where branch1 is grafted onto branch2 and
> branch2 is grafted onto branch1:
>
>      elif possible_parent.symbol == cvs_branch.symbol:
>        # Only branches that precede the branch to be adjusted are
>        # considered possible parents.  Leave parentage unchanged:
>        return
>
> Because of that code, there is never an attempt to graft a branch that
> is earlier in the list onto one that is later in the list.  Therefore,
> grafting a branch that is later in the list cannot affect how branches
> that are earlier in the list are grafted.  Therefore, if we process
> branches in *reverse* order, there should be no need for special code.
> See move-parents.patch for an example patch.  Does this work for you?

I'll try this in the complete repository.

Best regards,
  Anders Pilegaard

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2699569

To unsubscribe from this discussion, e-mail: [[email protected]].