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

Re: [StGit PATCH] Remove --undo flags from stg commands and docs

From
Karl Hasselström <kha@treskal.com>
Date
Jul 8, 2008, 04:21 UTC
Message-ID
<20080708042131.GB2247@diana.vm.bytemark.co.uk>
In-Reply-To
<b0943d9e0807071354j50dca83aya90317f97f559b19@mail.gmail.com>
On 2008-07-07 21:54:01 +0100, Catalin Marinas wrote:
Show 7 quoted lines
> 2008/7/4 Karl Hasselström <kha@treskal.com>:
>
> > In this one, I've just removed the --undo flag from sync without
> > adding anything back. Still undetermined if that's OK.
>
> I think it should be ok (see the other thread). Anyway, have you
> heard of anyone else using sync apart from me?
No, I haven't.

I've tried to understand what it does, and as far as I can tell it doesn't do quite what I want. (What I want is the ability to 3-way merge StGit patch stacks, so that I can modify the same patch stack in several places and merge back and forth. From what I recall, the sync command is more like a 2-way merge -- that is, it doesn't take the last common ancestor into account. But it's been a while since I studied it.)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Catalin MarinasNext: Catalin Marinas
Message 3 of 5 in “Remove --undo flags from stg commands and docs”
  1. Remove --undo flags from stg commands and docsKarl Hasselström, Jul 4, 2008
  2. Catalin MarinasJul 7, 2008
  3. Karl HasselströmJul 8, 2008
  4. Catalin MarinasJul 12, 2008
  5. Karl HasselströmJul 14, 2008

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.