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

Re: [RFC PATCH] Record a single transaction for conflicting push operations

From
GHGustav Hållberg <gustav@virtutech.com>
Date
Dec 21, 2009, 14:31 UTC
Message-ID
<4B2F86BB.9090104@virtutech.com>
In-Reply-To
<b8197bcb0912210548q67c1da4bhe023bed2811394d4@mail.gmail.com>
On 2009-12-21 14:48, Karl Wiberg wrote:
> I've seen more than one complaint that the current behavior is
> confusing even if we don't count the bug, so I thought this was part
> of the motivation.

I don't know if this would be better than the other suggested solutions, but if "stg log" would clearly identify multi-stage entries as such, the current confusion would probably mostly go away.

Currently this is done reasonably well for make_temp_patch(), which says "refresh (create temporary patch)" in the log, but I think this could be taken further.

For example, if such annotations said "foo: stage N" or similar, indicating that this was the Nth step in the "foo" command (think "rebase" or whatever), it would be good enough for me least.

- Gustav
Previous: Karl WibergNext: Catalin Marinas
Message 9 of 10 in “Record a single transaction for conflicting push operations”
  1. Record a single transaction for conflicting push operationsCatalin Marinas, Dec 17, 2009
  2. Karl WibergDec 18, 2009
  3. Catalin MarinasDec 18, 2009
  4. Karl WibergDec 19, 2009
  5. Catalin MarinasDec 20, 2009
  6. Karl WibergDec 21, 2009
  7. Catalin MarinasDec 21, 2009
  8. Karl WibergDec 21, 2009
  9. Gustav HållbergDec 21, 2009
  10. Catalin MarinasDec 22, 2009

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.