From: Jon Smirl Date: Sat, 15 Sep 2007 14:25:39 GMT Subject: Re: STG, problem with pop/push of alternative versions of a patch Message-ID: <9e4733910709150725k73bec66bw753c4b3c01244cff@mail.gmail.com> In-Reply-To: On 9/15/07, Catalin Marinas wrote: > On 15/09/2007, Jon Smirl 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