From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: Pavel Roskin <proski@gnu.org>, git@vger.kernel.org
Subject: Re: stg clean removes conflicting patch
Date: Fri, 25 Jan 2008 11:17:27 +0100 [thread overview]
Message-ID: <20080125101727.GA7101@diana.vm.bytemark.co.uk> (raw)
In-Reply-To: <b0943d9e0801250153t30c5b9b8w4c08af107cfdf202@mail.gmail.com>
On 2008-01-25 09:53:46 +0000, Catalin Marinas wrote:
> On 25/01/2008, Karl Hasselström <kha@treskal.com> wrote:
>
> > On 2008-01-24 22:55:17 -0500, Pavel Roskin wrote:
> >
> > > If "stg push" fails, the subsequent "stg clean" will remove the
> > > patch that could not been applied. I think it's wrong.
> >
> > I agree. It's consistent -- a conflicting patch is empty -- but
> > clearly the wrong thing to do from a usability perspective.
>
> Got broken by commit fe1cee2e49d9995852ba92d8fba1d064acf2fca9 which
> removes the check_conflicts() call.
Ah, thanks. I didn't realize it used to work.
> As I said in a different post, we should add these back (and to the
> 'goto' command as well) to make StGIT safer.
The right thing to do would be to check for conflicts before
attempting any kind of modification, I guess.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
prev parent reply other threads:[~2008-01-25 10:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-25 3:55 stg clean removes conflicting patch Pavel Roskin
2008-01-25 8:04 ` Karl Hasselström
2008-01-25 8:40 ` Pavel Roskin
2008-01-25 9:53 ` Catalin Marinas
2008-01-25 10:17 ` Karl Hasselström [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=20080125101727.GA7101@diana.vm.bytemark.co.uk \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=proski@gnu.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).