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

Re: [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Mar 11, 2007, 22:21 UTC
Message-ID
<46a038f90703111521h59079864q9c9f5d922c92dc99@mail.gmail.com>
In-Reply-To
<7v4pot281h.fsf@assigned-by-dhcp.cox.net>
On 3/10/07, Junio C Hamano <junkio@cox.net> wrote:
Show 8 quoted lines
> Frank Lichtenheld <frank@lichtenheld.de> writes:
>
> > Using Update-existing leads to the client forgetting about the "locally
> > modified" status of the file which can lead to loss of local changes on
> > later updates.
>
> To me, both of these hunks look correct (the first one is clean
> merge, the second one is merge with conflicts).  Ack?
Ack!
m
Previous: Junio C Hamano
Message 3 of 3 in “cvsserver: Use Merged response instead of Update-existing for merged files”
  1. cvsserver: Use Merged response instead of Update-existing for merged filesFrank Lichtenheld, Mar 6, 2007
  2. Junio C HamanoMar 10, 2007
  3. Martin LanghoffMar 11, 2007

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.