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
Jan 7, 2006, 11:23 UTC
Message-ID
<43BFA499.3020202@gmail.com>
In-Reply-To
<200512301859.51000.blaisorblade@yahoo.it>
Blaisorblade wrote:
>The original patch hasn't been merged, nor (for what I see) anything else to 
>fix this problem has been done.
>  
>
Indeed, I forgot about it.
Show 5 quoted lines
>I assume the patch was lost waiting for the discussion to settle down, but the 
>patch can be merged, even changing the default choices in any way (see 
>below).
>  
>

I merged it as it is. I will think about the default options once I get some time to fix the .local, .older and .remote extensions (give them some meaningful names).

Show 6 quoted lines
>Also, another note: I just found Bruce Eckel mentioning pychecker, which is a 
>static code checker for Python (to perform the checks a compiler would 
>normally do). I've not the time to investigate more myself, but I hope it can 
>be useful to you.
>  
>
Thanks. I'll give it a try.
Catalin
Previous: BlaisorbladeNext: Chuck Lever
Message 8 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.