On Wed, Jun 18, 2008 at 12:57:31PM +0200, Ingo Molnar <mingo@elte.hu> wrote:
quoted text
> just to demonstrate it, i tried today to do an octopus merge of 87 topic=
=20
quoted text
> branches:
>=20
> git-merge build checkme core/checkme core/debugobjects core/futex-64bit=
=20
quoted text
> core/iter-div core/kill-the-BKL core/locking core/misc core/percpu=20
> core/printk core/rcu core/rodata core/softirq core/softlockup=20
> core/stacktrace core/topology core/urgent cpus4096 genirq kmemcheck=20
> kmemcheck2 mm/xen out-of-tree pci-for-jesse safe-poison-pointers sched=20
> sched-devel scratch stackprotector timers/clockevents timers/hpet=20
> timers/hrtimers timers/nohz timers/posixtimers tip tracing/ftrace=20
> tracing/ftrace-mergefixups tracing/immediates tracing/markers=20
> tracing/mmiotrace tracing/mmiotrace-mergefixups tracing/nmisafe=20
> tracing/sched_markers tracing/stopmachine-allcpus tracing/sysprof=20
> tracing/textedit x86/apic x86/apm x86/bitops x86/build x86/checkme=20
> x86/cleanups x86/cpa x86/cpu x86/defconfig x86/delay x86/gart x86/i8259=
=20
quoted text
> x86/idle x86/intel x86/irq x86/irqstats x86/kconfig x86/ldt x86/mce=20
> x86/memtest x86/mmio x86/mpparse x86/nmi x86/numa x86/numa-fixes x86/pat=
=20
quoted text
> x86/pebs x86/ptemask x86/resumetrace x86/scratch x86/setup x86/smpboot=20
> x86/threadinfo x86/timers x86/urgent x86/urgent-undo-ioapic x86/uv=20
> x86/vdso x86/xen x86/xsave
>=20
> it failed miserably:
>=20
>  warning: ignoring 066519068ad2fbe98c7f45552b1f592903a9c8c8; cannot=20
>  handle more than 25 refs

The upcoming builtin-merge won't have this problem. I have added a
testcase for this in my working branch:

http://repo.or.cz/w/git/vmiklos.git?a=3Dcommit;h=3D7eef40b3cd772692c6eb7520=
686300533f35f10c