[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update -j <branch-tag> failes to merge
From: |
Asbjørn Sæbø |
Subject: |
CVS update -j <branch-tag> failes to merge |
Date: |
Fri, 13 May 2005 10:04:59 +0200 |
User-agent: |
Mutt/1.4i |
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.
(See example at the bottom, where "dev_20050413_b" is the tag of the
branch I would like to merge.)
I have noted something that may be related to this problem: When doing
a "cvs status", I get an error message. However, the status command
still seems to work well:
----------------------------------------------------------------------
address@hidden:~/ldas/utvikling$ cvs status ldas/src/ldas_receiver.c
cvs [status aborted]: no such directory `ldas/src'
===================================================================
File: ldas_receiver.c Status: Up-to-date
Working revision: 1.36
Repository revision: 1.36 /local/cvs/ldas/src/ldas_receiver.c,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
------------------------------------------------------------------------
I have done some hours of RTFM and FAQ/archive reading, but have not
been able to solve this. Does anyone have any suggestions to what it
is that is wrong here?
With kind regards
Asbjørn Sæbø
address@hidden:~/ldas/utvikling$ cvs update -A ldas
cvs update: Updating ldas
cvs update: Updating ldas/doc
cvs update: Updating ldas/doc/doxygen
cvs update: Updating ldas/doc/ldasdoc
cvs update: Updating ldas/doc/ldasdoc/developer
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
cvs update: Updating ldas/doc/ldasdoc/usermanual
cvs update: Updating ldas/extracode
cvs update: Updating ldas/orig_src
cvs update: Updating ldas/src
cvs update: Updating ldas/testcode
address@hidden:~/ldas/utvikling$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
cvs update: Updating ldas/doc
cvs update: Updating ldas/doc/doxygen
cvs update: Updating ldas/doc/ldasdoc
cvs update: Updating ldas/doc/ldasdoc/developer
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
cvs update: Updating ldas/doc/ldasdoc/usermanual
cvs update: Updating ldas/extracode
cvs update: Updating ldas/orig_src
cvs update: Updating ldas/src
cvs update: Updating ldas/testcode
address@hidden:~/ldas/utvikling$
--
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/ >
- CVS update -j <branch-tag> failes to merge,
Asbjørn Sæbø <=