[Top][All Lists]

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

Merging branches

From: Cyrus Sukhia
Subject: Merging branches
Date: Mon, 27 Aug 2001 16:58:04 +0200

Hi all,

I've been kicking this around for a bit now and just don't
understand what the server is trying to tell me.  Perhaps someone
could shed some light on the subject ...

I run this command:

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.  In this particular case I would have
expected a conflict but there isn't one.  Since then I have added
this file to the trunk but nothing changes.  If this was the only
file I'd simply apply the changes myself on the desired branch
but there are a fair amount of files like this that make this a
Herculean task to do by hand.

Any ideas why I'm told this?  Any ideas what I can do?  Anything
would help.


Cyrus Sukhia - CCM
IconMedialab Belgium
21, rue des Chartreux
1000 Brussels, Belgium
+32 (02) 506.23.36

reply via email to

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