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

Re: [PATCH] fast-import: Document the effect of "merge" with no "from" in a commit

From
Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Date
Mar 21, 2008, 13:57 UTC
Message-ID
<FB8C4A1F-3DC1-4D7B-910B-5F721F39B244@orakel.ntnu.no>
In-Reply-To
<6FC571BB-D304-4D25-B1F2-1E03BD5438F8@orakel.ntnu.no>
On 20. mars. 2008, at 11.43, Eyvind Bernhardsen wrote:
Show 8 quoted lines
> On 20. mars. 2008, at 04.40, Shawn O. Pearce wrote:
>> As I understand it, this discussion about leaving out 'from' and
>> using 'merge' is only relevant on a *new* branch.
>
> Ah.  Unfortunately, that means that I don't understand why cvs2svn  
> works; it never removes files when creating a commit, even for an  
> existing branch, so I assumed that a "from" was required to populate  
> the tree.  I'll do some more testing to see what's going on.

It turns out that I'm an idiot and you're right. I'll rewrite the patch to reflect that the "merge" behaviour only applies when creating a branch.

-- 
Eyvind Bernhardsen
Previous: Shawn O. PearceNext: Eyvind Bernhardsen
Message 6 of 9 in “"commit"s without "from" in fast-import”
  1. Eyvind BernhardsenMar 17, 2008
  2. Shawn O. PearceMar 18, 2008
  3. Shawn O. PearceMar 19, 2008
  4. James WestbyMar 19, 2008
  5. Shawn O. PearceMar 20, 2008
  6. Eyvind BernhardsenMar 21, 2008
  7. fast-import: Document the effect of "merge" with no "from" in a commitEyvind Bernhardsen, Mar 21, 2008
  8. Shawn O. PearceMar 23, 2008
  9. Junio C HamanoMar 23, 2008

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.