From: Michael J Gruber <git@drmicha.warpmail.net>
To: unlisted-recipients:; (no To-header on input)
Cc: michael.meeks@novell.com, git@vger.kernel.org, kendy@novell.com,
Norbert Thiebaud <nthiebaud@gmail.com>
Subject: Re: libreoffice merge(tool?) issue #3 ...
Date: Wed, 23 Feb 2011 14:22:11 +0100 [thread overview]
Message-ID: <4D650A03.8030106@drmicha.warpmail.net> (raw)
In-Reply-To: <4D64ED12.5050802@drmicha.warpmail.net>
Michael J Gruber venit, vidit, dixit 23.02.2011 12:18:
> Note that you're merging branches which are way off,
>
> git rev-list --count --left-right
> origin/integration/dev300_m98...stage/ooo/dev300
> 3566 3126
>
> and that the merge base is quite old:
>
> af61642 (#i105937# Fixed a few remaining gradient glitches, 2010-01-16)
Following up on this:
git rev-list --count --left-right
origin/integration/dev300_m98...stage/ooo/dev300
3566 3126
git rev-list --count --left-right --no-merges
origin/integration/dev300_m98...stage/ooo/dev300
2794 2180
git rev-list --count --left-right --no-merges --cherry-pick
origin/integration/dev300_m98...stage/ooo/dev300
1136 528
That is, 2500 of these different commits are patch-equivalent
(cherry-picks). I don't think "merge" is the best tool to combine "fake"
branches like those. You may be better off with rebase... Although I'm
wondering what the branch policy was that lead to this.
Michael
prev parent reply other threads:[~2011-02-23 13:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 15:34 libreoffice merge(tool?) issue #3 Michael Meeks
2011-02-22 15:55 ` Brian Gernhardt
2011-02-24 16:39 ` libreoffice merge(tool?) issue #3 ... (bogus) Michael Meeks
2011-02-25 10:08 ` Michael J Gruber
2011-02-25 20:55 ` Andres Freund
2011-02-28 14:25 ` copying git repositories Michael Meeks
2011-02-28 15:03 ` Andres Freund
2011-02-28 15:10 ` Brian Gernhardt
2011-02-22 17:30 ` libreoffice merge(tool?) issue #3 Michael J Gruber
2011-02-22 18:14 ` Michael Meeks
2011-02-23 11:18 ` Michael J Gruber
2011-02-23 13:22 ` Michael J Gruber [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=4D650A03.8030106@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=kendy@novell.com \
--cc=michael.meeks@novell.com \
--cc=nthiebaud@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 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).