Re: gdb_7_3-branch not buildable?

[Jim Meyering <jim@meyering.net>]

Andreas Schwab wrote:
> Jim Meyering <jim@meyering.net> writes:
>> Andreas Schwab wrote:
>>> Jim Meyering <jim@meyering.net> writes:
>>>
>>>>   # Rebase to proper branch point:
>>>>   git tag gdb_7_3-2011-04-01-branchpoint
>>>> c73dde705c3b163b5101ed4cc4506cef6cc58905
>>>>   git branch --track v7.3 remotes/origin/gdb_7_3-branch && git co v7.3
>>>>   git rebase --onto gdb_7_3-2011-04-01-branchpoint master v7.3
>>>
>>> You should have reset the branch to the branchpoint, not rebase.
>>
>> Why do you say that?
>
> So that all the commits can be properly reimported, instead of
> potentially remaining broken.
>
>> tell us what you actually did?
>
> Reset the branch and rerun cvsimport.

As far as I can see, all of the commits were imported into the
git repository without error.  The only problem is that
the branch tag appeared in CVS a few days after it should have,
and the intervening commits all happened to belong on the branch.
At least those ~20 intervening commits just happened to represent
precisely the differences I was seeing between the git and cvs
versions of the 7.3 branch.

Bottom line, since the desired commits were already there,
and contiguous with the old base of the branch, rebasing
the 7.3 branch to the earlier commit on the trunk did
exactly what was required.  That's why the inter-(cvs-git)-diff
is now effectively empty for the 7.3 branch.