On Tue, 2005-08-23 at 19:58 -0400, Junio C Hamano wrote:
> Len Brown <[EMAIL PROTECTED]> writes:
> >> I could get to 81065e2f415af6... commit (Linus tip at this
> >> moment), so if you can tell me where to snarf the other commit
> >> (702c7e76....) that would help me diagnose the problem a lot.
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/lenb/to-akpm.git
> I think merge-base, even though we attempted to fix it recently,
> is still confused and that is one of the reasons why you are
> getting this.
> prompt$ git-rev-parse origin test-lenb-merge
> prompt$ git-merge-base origin test-lenb-merge
> prompt$ git show-branch origin test-lenb-merge
> ! [origin] zd1201 kmalloc size fix
> * [test-lenb-merge] [ACPI] fix ia64 build issues resulting from
> + [origin] zd1201 kmalloc size fix
> + [origin~1] md: make sure resync gets started when array starts.
> + [origin~2] preempt race in getppid
> + [origin~3] Merge master.kernel.org:/pub/scm/linux/kernel/git/da
> -- >8 -- snip -- >8 --
> + Merge ../to-linus-stable/
> ++ [ACPI] re-enable platform-specific hotkey drivers by default
> + ARM: 2851/1: Fix NWFPE extended precision exception handling
> ++ [origin~34] intelfb/fbdev: Save info->flags in a local variable
> prompt$ git-rev-parse origin~34
> Notice that show-branch, which walks the commit ancestry chain
> pretty much the same way merge-base does, notices and stops at
> origin~34 (that's 34th generation first parent commit from Linus
> tip) that is the common commit between the two heads being
> merged? And that commit, 3edea48... is different from what
> merge-base is reporting.
> If I maually run merge-cache using origin~34 as the merge base,
> only the following two files needs to result in non-simple merge:
> Do these two files match your expectation?
No, I don't think so.
Unless I missed something, to-akpm should be a proper super-set
of from-linus, so I wouldn't expect a merge on these two.
> I'll take a look at merge-base.c next, but just in case I CC:ed
> this to Linus, who is more familiar with that code.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html