Re: STG, problem with pop/push of alternative versions of a patch
- From
Jon Smirl <jonsmirl@gmail.com>
- Date
- Sep 15, 2007, 14:25 UTC
- Message-ID
- <9e4733910709150725k73bec66bw753c4b3c01244cff@mail.gmail.com>
- In-Reply-To
- <b0943d9e0709150107o27571446v9bef8e31517777e1@mail.gmail.com>
On 9/15/07, Catalin Marinas <catalin.marinas@gmail.com> wrote:
Show 10 quoted lines
> 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.
Show 11 quoted lines
> > 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