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

Re: StGIT: "stg new" vs "stg new --force"

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Jan 21, 2006, 18:31 UTC
Message-ID
<b0943d9e0601211031h2ef0a499s@mail.gmail.com>
In-Reply-To
<1137517300.20556.26.camel@dv>
On 17/01/06, Pavel Roskin <proski@gnu.org> wrote:
> I was going to suggest that would be logical to run "stg refresh"
> implicitly if "stg new" is used on modified files.  But then I realized
> that it would be even better if future versions of StGIT allowed to
> refresh (i.e. add changes to) patches other that the current one.

I think that would be useful but not easy to implement. StGIT was designed so that all operations happen on the top patch. The current tree changes depend on the top patch and refreshing a different patch with those changes would involve a three-way merge operation. This merging can generate conflicts which are not relevant to the top tree and they might even destroy the changes (depending on the merge options).

The way I work is, again, through a dummy patch which can be folded into the patch I want. This way I am sure that I still have the changes in the dummy patch if I'm not happy with the merge. Maybe all these could be done transparently and automatically remove the dummy patch if conflicts exist.

--
Previous: Catalin Marinas
Message 19 of 19 in “StGIT: "stg new" vs "stg new --force"”
  1. Pavel RoskinJan 13, 2006
  2. Karl HasselströmJan 13, 2006
  3. Catalin MarinasJan 16, 2006
  4. Pavel RoskinJan 17, 2006
  5. Yann DirsonJan 17, 2006
  6. Pavel RoskinJan 17, 2006
  7. Yann DirsonJan 18, 2006
  8. Pavel RoskinJan 19, 2006
  9. Yann DirsonJan 19, 2006
  10. Pavel RoskinJan 20, 2006
  11. J. Bruce FieldsJan 20, 2006
  12. Pavel RoskinJan 24, 2006
  13. J. Bruce FieldsJan 24, 2006
  14. Pavel RoskinJan 24, 2006
  15. Catalin MarinasJan 24, 2006
  16. Catalin MarinasJan 21, 2006
  17. Pavel RoskinJan 22, 2006
  18. Catalin MarinasJan 21, 2006
  19. Catalin MarinasJan 21, 2006

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.