On Fri, May 13, 2005 at 10:04:59AM +0200, Asbj�rn S�b� wrote: > I have a CVS module (named "ldas") where I would like to merge the > contents of a branch into the trunk. According to the documentation, > is seems that I should be able to du this using "cvs update -j > <branch-tag>". However, this does not work. No merging takes place, > the files on the trunk do not receive the changes from the branch. > [...] > [EMAIL PROTECTED]:~/ldas/utvikling$ cvs update -j dev_20050413_b ldas
However, when I changed into the ldas directory, and did the update, it worked: [EMAIL PROTECTED]:~/ldas/utvikling$ cd ldas [EMAIL PROTECTED]:~/ldas/utvikling/ldas$ cvs update -j dev_20050413_b . [Much retrieving and merging] Is this difference between naming the module/directory and standing in the module/directory expected behaviour? Asbj�rn -- Asbj�rn S�b�, post.doc. Centre for Quantifiable Quality of Service in Communication Systems Norwegian University of Science and Technology <URL: http://www.q2s.ntnu.no/ > _______________________________________________ Info-cvs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-cvs
