Re: git problems/question

[Fred Cooke <fred dot cooke at gmail dot com>]

Interesting. An artifact of sharing a repo between projects with
different lifecycles.

Without knowing that, though, the commands I gave offered the same end result:

fred@falcon:~/repos/tools/binutils-gdb$ git rev-parse binutils-2_23-branchpoint
213bd1b3f2e81c6fea0f8bcfe363d69b5608ce5e
fred@falcon:~/repos/tools/binutils-gdb$ git merge-base
binutils-2_23-branchpoint binutils-2_27
af18cb5940792b85abae45d5591c455b207e03f5
fred@falcon:~/repos/tools/binutils-gdb$ git rev-parse binutils-2_23-branchpoint^
af18cb5940792b85abae45d5591c455b207e03f5
fred@falcon:~/repos/tools/binutils-gdb$ git merge-base binutils-2_23
binutils-2_27
af18cb5940792b85abae45d5591c455b207e03f5
fred@falcon:~/repos/tools/binutils-gdb$ git log --oneline
af18cb5940792b8..binutils-2_23 | wc
    139     919    7661



On Sat, Oct 1, 2016 at 3:44 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:
> On Sep 30 2016, Christian Groessler <chris@groessler.org> wrote:
>
>> Still I'm getting many conflicts:
>>
>> $ git checkout -b test-branch binutils-2_23-branchpoint
>> $ git merge binutils-2_27
>>
>>
>> Was 2.23 still on cvs and this is some fallout from the transition to git?
>
> Yes, this due to the way branches were cut in the CVS days and how
> cvs2git tried to repreduce that very closely, by creating a commit that
> deletes every file not part of binutils-2_23-branch in CVS.  Nowadays, a
> branch contains all files from the combined repository, even those not
> part of binutils.  Thus you will get modify/delete conflicts for all
> those files that were deleted in the commit pointed to by
> binutils-2_23-branchpoint.  To avoid that start with the parent of
> binutils-2_23-branchpoint.
>
> Andreas.
>
> --
> Andreas Schwab, schwab@linux-m68k.org
> GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
> "And now for something completely different."