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

Re: Stgit and refresh-temp

From
Karl Hasselström <kha@treskal.com>
Date
Nov 7, 2008, 05:44 UTC
Message-ID
<20081107054419.GA27146@diana.vm.bytemark.co.uk>
In-Reply-To
<9e4733910811040537p4e88c09an94370154eca12778@mail.gmail.com>
On 2008-11-04 08:37:24 -0500, Jon Smirl wrote:
> I hit a case when refreshing a buried patch that needed a merge
> conflict sorted out. I'm unable to recover out of the state.

Hmm, so what you're saying is basically that you did something with "stg refresh -p" that caused a merge conflict, and that messed things up so that you needed to run "stg repair". Is that right?

Have you been able to reproduce it? (I would like to add the failing case to the test suite.)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Jon SmirlNext: Jon Smirl
Message 4 of 14 in “Stgit and refresh-temp”
  1. Jon SmirlNov 4, 2008
  2. Jon SmirlNov 4, 2008
  3. Jon SmirlNov 4, 2008
  4. Karl HasselströmNov 7, 2008
  5. Jon SmirlNov 10, 2008
  6. Jon SmirlNov 10, 2008
  7. Catalin MarinasNov 11, 2008
  8. Karl HasselströmNov 12, 2008
  9. Catalin MarinasNov 12, 2008
  10. Karl HasselströmNov 12, 2008
  11. Catalin MarinasNov 23, 2008
  12. Karl HasselströmNov 24, 2008
  13. Jon SmirlNov 24, 2008
  14. Karl HasselströmNov 12, 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.