git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jon Smirl" <jonsmirl@gmail.com>
To: "Catalin Marinas" <catalin.marinas@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: STG, problem with pop/push of alternative versions of a patch
Date: Sat, 15 Sep 2007 10:25:39 -0400	[thread overview]
Message-ID: <9e4733910709150725k73bec66bw753c4b3c01244cff@mail.gmail.com> (raw)
In-Reply-To: <b0943d9e0709150107o27571446v9bef8e31517777e1@mail.gmail.com>

On 9/15/07, Catalin Marinas <catalin.marinas@gmail.com> wrote:
> On 15/09/2007, Jon Smirl <jonsmirl@gmail.com> wrote:
> > I trying to test two different versions of a patch that add files.
> > These patches create a new directory and add several files. When I pop
> > a version of the patch the directory and files and not getting
> > removed. This causes an error when I push the alternative version of
> > the patch.
>
> This shouldn't happen AFAICT (at least for the files, as GIT doesn't
> care much about directories). What GIT/StGIT version are you using?
> StGIT simply calls GIT to do the HEAD switch.

I have played around with some more. It is more complicated than the
simple case I described.  Earlier I noticed a message about applying a
patch that was empty that shouldn't have been. I checked and the patch
is indeed empty. The empty patch probably caused the files to be left.
I had been using hide/unide and reordering with on the patch and had
encountered a couple errors in stg. I'll try and track down the
sequence that caused the contents of the patch to be lost.


>
> Could you run 'stg patches drivers/net/fec_mpc52xx/Kconfig' with the
> initial series pushed? It should show which patches touch this file.
> If it doesn't show any, maybe the files weren't added to any patch and
> hence the error.
>
> Thanks.
>
> --
> Catalin
>


-- 
Jon Smirl
jonsmirl@gmail.com

  reply	other threads:[~2007-09-15 14:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-15  3:49 STG, problem with pop/push of alternative versions of a patch Jon Smirl
2007-09-15  8:07 ` Catalin Marinas
2007-09-15 14:25   ` Jon Smirl [this message]
2007-09-15 17:31     ` Catalin Marinas
2007-09-15 17:42       ` Jon Smirl
2007-09-15 22:44         ` Catalin Marinas

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=9e4733910709150725k73bec66bw753c4b3c01244cff@mail.gmail.com \
    --to=jonsmirl@gmail.com \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.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).