From: Johannes Sixt <j.sixt@viscovery.net>
To: Matthew Cengia <mattcen@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Bizarre git merge behaviour
Date: Wed, 20 Nov 2013 13:29:52 +0100 [thread overview]
Message-ID: <528CAB40.8030107@viscovery.net> (raw)
In-Reply-To: <20131120120326.GD26413@debian.cengia.id.au>
Am 11/20/2013 13:03, schrieb Matthew Cengia:
> The only changes I expect are these:
>
> mattcen@sonar:prisonpc(wtf)$ git --no-pager diff --numstat --oneline
> \ "$(git merge-base wtf origin/22869-new-kernel)"
> origin/22869-new-kernel 37 0 client/kernel/README 2797
> 0 client/kernel/config-3.5.7.20-1 0 3525
> client/kernel/config-3.5.7.21-1 - -
> client/kernel/linux-firmware-image_3.5.7.21-1_i386.deb - -
> client/kernel/linux-image-3.5.7.20_3.5.7.20-1_i386.deb - -
> client/kernel/linux-image-3.5.7.21_3.5.7.21-1_i386.deb 1 0
> client/scm/20-security.scm 6 7
> client/scm/50-kernel-prisoner.scm 1 0
> client/scm/50-staff.scm 22 0
> doc/user_acceptance_tests/README 581 0
> doc/user_acceptance_tests/default.css 1548 0
> doc/user_acceptance_tests/user_acceptance_tests.html 4268 0
> doc/user_acceptance_tests/user_acceptance_tests.pdf 940 0
> doc/user_acceptance_tests/user_acceptance_tests.rst
> mattcen@sonar:prisonpc(wtf)$ git log --left-right --oneline \
> wtf...origin/22869-new-kernel ppcadm/modules/quarantine.py | cut
> -c1-70 < 5b5f552 Fixed msg vs msg.as_string because smtp.sendmail is
> picky < 03618f2 Use Return-Path, not X-Original-Envelope-From. <
> dc1169e Bug squashing. < 8e20216 Changed quarantine module to run
> maybe and send directly to < d79ad42 Change final port, name the
> magic number. < e44d1b3 Merge remote-tracking branch 'origin/staging'
> into 22912-ppc < a03db6d Modified quarantine UI to handle the new
> reports format
So, ppcadm/modules/quarantine.py changed only on our side, but not on
their side. This is in accordance with your listing above. Nevertheless,
the file is marked conflicted in your git status --porcelain output in
the original post:
UU ppcadm/modules/quarantine.py
That's strange. I can't tell what is going on. Perhaps you have some
criss-cross merges in your history that merge-recursive trips over?
Sorry, I don't know how to help you further.
-- Hannes
next prev parent reply other threads:[~2013-11-20 12:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-20 3:49 Bizarre git merge behaviour Matthew Cengia
2013-11-20 7:20 ` Johannes Sixt
2013-11-20 12:03 ` Matthew Cengia
2013-11-20 12:29 ` Johannes Sixt [this message]
2013-11-20 12:33 ` Matthew Cengia
2013-11-21 6:37 ` Matthew Cengia
2013-11-20 15:34 ` Jakub Narębski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=528CAB40.8030107@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=mattcen@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.