From: Yaroslav Halchenko <debian@onerussian.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: problem with cherry-picking a commit which comes before introducing a new submodule
Date: Fri, 7 Jan 2011 18:48:42 -0500 [thread overview]
Message-ID: <20110107234841.GQ6040@onerussian.com> (raw)
In-Reply-To: <20110107230017.GA15495@burratino>
sorry -- lame me... 1.7.2.3 ... I will check with current version as soon as
kids permit ;-)
% apt-cache policy git
git:
Installed: 1:1.7.2.3-2.2
Candidate: 1:1.7.2.3-2.2
Version table:
*** 1:1.7.2.3-2.2 0
900 http://debian.lcs.mit.edu/debian/ squeeze/main amd64 Packages
800 http://debian.lcs.mit.edu/debian/ sid/main amd64 Packages
100 /var/lib/dpkg/status
% git --version
git version 1.7.2.3
On Fri, 07 Jan 2011, Jonathan Nieder wrote:
> One more piece of protocol: what git version are you using? The
> release notes mention a fix in this area in v1.7.3[1]:
> * "git merge -s recursive" (which is the default) did not handle cases
> where a directory becomes a file (or vice versa) very well.
> Hopefully this is that. In any case, sounds like a bug.
> (Hopefully someone else can comment on why cherry-pick uses the
> merge machinery to notice conflicts that would not be clear from
> the patch alone.)
> Thanks again.
> Jonathan
> [1] There is an updated Debian source package at [2]. Or, probably
> faster: one can use the build result in bin-wrappers/ from a git.git
> clone in place.
> [2] http://mentors.debian.net/debian/pool/main/g/git/git_1.7.4~rc1-0.1.dsc
--
=------------------------------------------------------------------=
Keep in touch www.onerussian.com
Yaroslav Halchenko www.ohloh.net/accounts/yarikoptic
next prev parent reply other threads:[~2011-01-07 23:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 17:24 problem with cherry-picking a commit which comes before introducing a new submodule Yaroslav Halchenko
2011-01-07 18:15 ` Jonathan Nieder
2011-01-07 18:32 ` Yaroslav Halchenko
2011-01-07 23:00 ` Jonathan Nieder
2011-01-07 23:48 ` Yaroslav Halchenko [this message]
2011-01-08 0:01 ` Yaroslav Halchenko
2011-01-11 13:27 ` Jonathan Nieder
2011-01-18 16:02 ` Yaroslav Halchenko
2011-01-18 16:08 ` Andreas Ericsson
2011-01-18 16:20 ` Yaroslav Halchenko
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=20110107234841.GQ6040@onerussian.com \
--to=debian@onerussian.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=newren@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.