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

Re: cvsps wierdness

From
Robin Rosenberg (list subscriber) <robin.rosenberg.lists@dewire.com>
Date
Jun 13, 2006, 06:06 UTC
Message-ID
<200606130806.21395.robin.rosenberg.lists@dewire.com>
In-Reply-To
<Pine.LNX.4.64.0606121406200.5498@g5.osdl.org>

måndag 12 juni 2006 23:27 skrev Linus Torvalds: [...]

> Does this patch fix it for you (untested - it could result in tons of
> other trouble, but it basically just says that time ordering is less
> important than member revision ordering).

Thanks, it worked on the simple case at least. We'll see about the original full repo later. 

>
> I don't think this is strictly correct, btw. I suspect you can still get
> into strange situations where the changeset merging has resulted in one
> file ordering one way, and another file ordering the other way.

Doesn't cvsps's conflict handing simply break up those patches into several patches? More patches is ok. Suboptimal patches can be accepted

-- robin
Previous: Linus Torvalds
Message 4 of 4 in “cvsps wierdness”
  1. Robin Rosenberg (list subscriber)Jun 12, 2006
  2. Linus TorvaldsJun 12, 2006
  3. Linus TorvaldsJun 12, 2006
  4. Robin Rosenberg (list subscriber)Jun 13, 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.