git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Crane Cai <crane.cai@amd.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [question] retrieve some patches from another repository
Date: Wed, 20 Jan 2010 16:09:15 +0800	[thread overview]
Message-ID: <20100120080915.GB1965@crane-desktop> (raw)
In-Reply-To: <7vljft5m7h.fsf@alter.siamese.dyndns.org>

Hi Junio,

Thank you. It's my pleasure to get git maintainer's response.

On Tue, Jan 19, 2010 at 10:23:14PM -0800, Junio C Hamano wrote:
> > * merge point will cause duplicated patch generated, for example repo B has x,
> >   y, z, then accepted by repo A in merge point, and then merge back to repo B
> >   (they are different with commit id), they will generate 2 twice.
> 
> This is inevitable, if 'x' and (say) 'b' corresponds to each other but has
> textual changes due to different context.
So you mean git can not avoid generate 2 twice because they are different
commits. If I need this I will manually do it or add a new feature to let
format-patch can identify the relationship of the 2 repository, and then move
the 'since' point to avoid some point before merge.
Maybe it has value to do it. Many subsystem maintainers will easy to provide
patchset from any repository derived from linus to another repository which also
derived from linus. The patchset will let integration a little easy, you can use
'git bisect' to trace, git comments to understand the code. And all change list
is replayed, there almost no issue for integration.
> 
> 
> You are probably running "format-patch a.. -- path/to/file.c".  Try giving
> it the --full-diff option as well.  We've recently discussed to make it
> the default for format-patch but the discussion thread petered out and
> didn't reach conclusion.
Yes, you are right.

-- 
Best Regards,
- Crane

      reply	other threads:[~2010-01-20  8:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-20  5:46 [question] retrieve some patches from another repository Crane Cai
2010-01-20  6:23 ` Junio C Hamano
2010-01-20  8:09   ` Crane Cai [this message]

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=20100120080915.GB1965@crane-desktop \
    --to=crane.cai@amd.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).