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


_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs

Reply via email to