On Wed, Oct 20, 2010 at 6:48 AM, Ingo Molnar <mingo@xxxxxxx> wrote:
>
> I re-created the merge commit the following way:
>
> git checkout c2f4398 # has old drivers/acpi/pci_irq.c
> git merge 662c319 # contains new drivers/acpi/pci_irq.c bits
The other way around. The c2f4398 version is the new one, the 662c319
is the old one. So git picks the new one.
How do I know? Look here:
[torvalds@i5 linux]$ git merge-base -a c2f4398 662c319
6a94cb73064c952255336cc57731904174b2c58f
and then you can do
[torvalds@i5 linux]$ git diff --stat 6a94cb7..c2f4398 drivers/acpi/pci_irq.c
drivers/acpi/pci_irq.c | 472
+++++++++++++-----------------------------------
1 files changed, 130 insertions(+), 342 deletions(-)
[torvalds@i5 linux]$ git diff --stat 6a94cb7..662c319 drivers/acpi/pci_irq.c
[torvalds@i5 linux]$
Notice? The version in 662c319 is the _same_ as the merge base version
(== the old common one). So git simply picked the version that is
clearly the newer one, ie the one in c2f4398. There's not any data
conflict or anything. and that was a trivial merge as far as that file
is concerned.
After you do the merge, you'll also have
[torvalds@i5 linux]$ git diff c2f4398..5b56eec drivers/acpi/pci_irq.c
[torvalds@i5 linux]$
ie the merge did the expected thing and picked the new one.
If something got lost, it got lost elsewhere.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
