git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin Pirker <git.collector@gmail.com>
To: git@vger.kernel.org
Subject: synchronizing 2 heterogenous branches by cherry-pick
Date: Tue, 21 Jul 2009 14:42:10 +0200	[thread overview]
Message-ID: <8d53e6220907210542p4c989f3av2b57202fdd2db1f5@mail.gmail.com> (raw)

One of those weird real-world situations, advice appreciated:

Given...
one Git repository with
one branch "left" and one branch "right"
both branches have a different history (common ancestor is 0000000)
both branches have different content
_however_, at one specific commit in the "left" and "right"
branch it can be said that the content of specific
subdirectories is identical
these commits are marked with a tag "equal"

Thus, patches which only modify the identical
content can always be applied without conflicts on both branches.
I commit a new patch on "left", I can cherry-pick it to
"right" and both trees are identical again.

Issues:
Cheery-pick takes only one commit.
I have to find commits by hand.
Ideally, I want to specify equal..HEAD, if 10 commits are "left"
and "right" are 7, well, then cherry pick the last 3 from "left"
to "right".
Note that the patch content is always identical, the
commit text message (author/committer/timestamp/...) not
always
Note that ideally only one way synchronizing occurs. Bonus
points if I can add on both sides and then start magic sync...


Any good idea on how to automagically script these cherry-picking?

Martin

             reply	other threads:[~2009-07-21 12:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-21 12:42 Martin Pirker [this message]
2009-07-23  8:41 ` synchronizing 2 heterogenous branches by cherry-pick Martin Pirker
2009-07-23  8:51   ` Pierre Habouzit
2009-07-23  9:24     ` Martin Pirker

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=8d53e6220907210542p4c989f3av2b57202fdd2db1f5@mail.gmail.com \
    --to=git.collector@gmail.com \
    --cc=git@vger.kernel.org \
    /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).