From: Eyvind Bernhardsen Date: Fri, 21 Mar 2008 13:57:40 GMT Subject: Re: [PATCH] fast-import: Document the effect of "merge" with no "from" in a commit Message-ID: In-Reply-To: <6FC571BB-D304-4D25-B1F2-1E03BD5438F8@orakel.ntnu.no> On 20. mars. 2008, at 11.43, Eyvind Bernhardsen wrote: > 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