[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging branches

From: Larry Jones
Subject: Re: Merging branches
Date: Mon, 27 Aug 2001 11:51:00 -0400 (EDT)

Cyrus Sukhia writes:
> cvs update -j emailTrans
> Where emailTrans is the name of a branch that was created as the
> result of an import command.  The file in question currently
> resides on a branch called core_branch and does not exist on the
> trunk (it was added directly to the branch).  I see this message:
> cvs server: file exists, but has
> been added in revision emailTrans
> All I can think is "So what?"  It didn't do the merge but it
> hasn't told me why not.

Because, as far as CVS knows, you have two completely independent files
with the same name.  They have no common ancestor, so there's no basis
for CVS to use to perform a merge.

-Larry Jones

Don't you hate it when your boogers freeze? -- Calvin

reply via email to

[Prev in Thread] Current Thread [Next in Thread]