From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org
Subject: Re: [StGit PATCH 1/2] Convert "stg refresh" to the new infrastructure
Date: Sun, 29 Jun 2008 12:07:42 +0100 [thread overview]
Message-ID: <b0943d9e0806290407h5eecd27bg510dd09e0188abca@mail.gmail.com> (raw)
In-Reply-To: <20080629102147.GA5098@diana.vm.bytemark.co.uk>
2008/6/29 Karl Hasselström <kha@treskal.com>:
> On 2008-06-29 10:42:32 +0100, Catalin Marinas wrote:
>
>> 2008/6/25 Karl Hasselström <kha@treskal.com>:
>>
>> > And in the process, make it more powerful: it will now first
>> > create a temp patch containing the updates, and then try to merge
>> > it into the patch to be updated. If that patch is applied, this is
>> > done by popping, pushing, and coalescing; if it is unapplied, it
>> > is done with an in-index merge.
>>
>> Does it make sense to refresh an unapplied patch? Maybe adding a new
>> file to the patch but I don't really see a need for this.
>
> A change in a different part of the same file should work as well, I
> believe.
>
> But no, I don't have a strong sense that this is super useful. It was
> just easy to allow, so I allowed it.
It seems harmless, unless someone finds some unusual behaviour. What
is the conflict behaviour? Is the refresh aborted? For unapplied
patches, it is more complicated to let the user solve the conflict.
--
Catalin
next prev parent reply other threads:[~2008-06-29 11:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-25 4:30 [StGit PATCH 1/2] Convert "stg refresh" to the new infrastructure Karl Hasselström
2008-06-25 4:30 ` [StGit PATCH 2/2] New refresh tests Karl Hasselström
2008-06-29 9:42 ` [StGit PATCH 1/2] Convert "stg refresh" to the new infrastructure Catalin Marinas
2008-06-29 10:21 ` Karl Hasselström
2008-06-29 11:07 ` Catalin Marinas [this message]
2008-06-29 13:46 ` Karl Hasselström
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=b0943d9e0806290407h5eecd27bg510dd09e0188abca@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.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).