[Top][All Lists]

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

Re: CVS update -j <branch-tag> failes to merge

From: Asbjørn Sæbø
Subject: Re: CVS update -j <branch-tag> failes to merge
Date: Fri, 13 May 2005 11:17:30 +0200
User-agent: Mutt/1.4i

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.
> [...]
> address@hidden:~/ldas/utvikling$ cvs update -j dev_20050413_b ldas

However, when I changed into the ldas directory, and did the update,
it worked:

address@hidden:~/ldas/utvikling$ cd ldas
address@hidden:~/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 Sæbø, post.doc. 
Centre for Quantifiable Quality of Service in Communication Systems
Norwegian University of Science and Technology
<URL: >

reply via email to

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