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

Re: [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Nov 15, 2005, 09:54 UTC
Message-ID
<b0943d9e0511150154y2d2af24ck@mail.gmail.com>
In-Reply-To
<20051113194225.20447.57910.stgit@zion.home.lan>
On 13/11/05, Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> wrote:
> I just got a "removal vs. changed" conflict, which is unhandled by StGit. That
> is taken from git-merge-one-file resolver, but is bad, as stg resolved does not
> handle unmerged entries (and probably it should be fixed too).

I think it 'stg resolved' should be fixed as well (in case there are unmerged entries for other reasons). My initial idea was to make gitmergeonefile not to leave any unmerged entries in the index. As you could see, there are cases where it failed.

I can see the following scenarios for a file:
1. deleted in the base and modified by the patch. It should leave the
file in the tree together with file.older. Another option would be to
remove the file and leave both file.older and file.remote in the tree
(here .remote means the version in the patch) but I would prefer the
first one.
2. changed in the base but deleted by the patch. It should remove the
file from the tree but leave file.older and file.local. The other
option is to leave the file in the tree but, as above, I prefer the
first one.

Maybe StGIT should try to track the renaming as well but I haven't played with this feature in GIT at all.

-- Catalin

Previous: Paolo 'Blaisorblade' GiarrussoNext: Blaisorblade
Message 2 of 9 in “Stgit - gitmergeonefile.py: handle removal vs. changes”
  1. Stgit - gitmergeonefile.py: handle removal vs. changesPaolo 'Blaisorblade' Giarrusso, Nov 13, 2005
  2. Catalin MarinasNov 15, 2005
  3. BlaisorbladeNov 16, 2005
  4. Catalin MarinasNov 17, 2005
  5. Chuck LeverNov 17, 2005
  6. Catalin MarinasNov 21, 2005
  7. BlaisorbladeDec 30, 2005
  8. Catalin MarinasJan 7, 2006
  9. Chuck LeverJan 8, 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.