git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: STG, problem with pop/push of alternative versions of a patch

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Sep 15, 2007, 17:31 UTC
Message-ID
<b0943d9e0709151031m70b9d03bw4068805e697e97f5@mail.gmail.com>
In-Reply-To
<9e4733910709150725k73bec66bw753c4b3c01244cff@mail.gmail.com>
On 15/09/2007, Jon Smirl <jonsmirl@gmail.com> wrote:
Show 19 quoted lines
> 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.

BTW, you can run 'stg log <patch>' to see how the patch was changed. It even has a -g option to invoke gitk and see each change.

One way a patch could become empty is if the changes it makes are already in the repository (in another patch or merged upstream).

-- 
Catalin
Previous: Jon SmirlNext: Jon Smirl
Message 4 of 6 in “STG, problem with pop/push of alternative versions of a patch”
  1. Jon SmirlSep 15, 2007
  2. Catalin MarinasSep 15, 2007
  3. Jon SmirlSep 15, 2007
  4. Catalin MarinasSep 15, 2007
  5. Jon SmirlSep 15, 2007
  6. Catalin MarinasSep 15, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.