[Top][All Lists]

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

Re: Merging II - Why do new files not get merged?

From: Karl-König Königsson
Subject: Re: Merging II - Why do new files not get merged?
Date: Tue, 26 Nov 2002 14:07:42 +0100
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.2b) Gecko/20021016

Euan Guttridge wrote:

I am trying to merge a branch with a tagged set of files. All works well except the newly created files in tag1 are not included in the merge, only existing files are merged. Please advise, thanks.

I expect that you have created a revision tag, i.e., you have tagged a specific set of files. If it was a branch tag, then I realise that you would expect the merge to work, but a revision tag is a different beast. For a merge to work in such a case you have to first create and add a file, and then tag it with your tag:

   cvs add
   cvs ci
   cvs tag tag1

Now, if you do a "cvs co -r tag1 module1" the newly created file will appear.

   Karl-Koenig Koenigsson

LIFF (n.) A book, the contents of which are totally belied by its cover. For instance, any book the dust jacket of which bears the words. 'This book will change your life'. (The Meaning of Liff, Douglas Adams)

reply via email to

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