info-cvs
[Top][All Lists]
Advanced

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

Branch merge and missing tags


From: Lemke, Michael IZ/HZA-IOR
Subject: Branch merge and missing tags
Date: Wed, 8 Dec 2004 15:41:41 +0100

This just hit me: If I do a branch merge (trunk to branch)
like this

   cvs up -d -P -j LAST_MERGED -j DEVJ_33

it will not create files that have been added to the trunk
because they don't have the LAST_MERGED tag yet.

So I remembered the -f flag and a command like this

   cvs up -d -P -f -j LAST_MERGED -j DEVJ_33

will create the file.  But, for which of the two -j tags will
it take the head revision?  What if the DEVJ_33 tag is missing?

Or am I doing the merge wrong?

Thanks,
Michael




reply via email to

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