From: "Avery Pennarun" <apenwarr@gmail.com>
To: "git discussion list" <git@vger.kernel.org>,
pasky@suse.cz, "Manoj Srivastava" <srivasta@debian.org>,
"vcs distro packaging discussion list"
<vcs-pkg-discuss@lists.alioth.debian.org>
Subject: Re: TopGit: problem with patch series generation
Date: Tue, 12 Aug 2008 12:25:36 -0400 [thread overview]
Message-ID: <32541b130808120925y663967ebm38eced6df77ffe4@mail.gmail.com> (raw)
In-Reply-To: <20080812161854.GB30067@lapse.rw.madduck.net>
On Tue, Aug 12, 2008 at 12:18 PM, martin f krafft <madduck@debian.org> wrote:
> As I am packaging TopGit for Debian, I encountered
> the situation that two branches conflict with each other (they
> change the same line), but there is no dependency between the
> branches. Thus, when I squash the branches into a series, the
> resulting patches will not apply (they both change the same original
> line to something else).
Isn't this what git-rerere is for? If TopGit doesn't use rerere,
maybe it would be easy to add...
Have fun,
Avery
next prev parent reply other threads:[~2008-08-12 16:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 16:18 TopGit: problem with patch series generation martin f krafft
2008-08-12 16:25 ` Avery Pennarun [this message]
[not found] ` <32541b130808120925y663967ebm38eced6df77ffe4-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-08-12 17:52 ` martin f krafft
2008-08-12 18:54 ` Bert Wesarg
2008-08-12 17:32 ` Petr Baudis
2008-08-12 23:07 ` martin f krafft
2008-08-12 21:28 ` Santi Béjar
2008-08-12 22:41 ` martin f krafft
2008-08-12 22:59 ` Petr Baudis
[not found] ` <20080812225916.GN10151-DDGJ70k9y3lX+M3pkMnKjw@public.gmane.org>
2008-08-12 23:10 ` martin f krafft
2008-08-13 0:18 ` Petr Baudis
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=32541b130808120925y663967ebm38eced6df77ffe4@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
--cc=srivasta@debian.org \
--cc=vcs-pkg-discuss@lists.alioth.debian.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).