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

[Jim Hyslop]

Asbjørn Sæbø wrote:
> 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?

No. I just tried it with cvs 1.11.20, and it worked OK:

C:\cvs-test\jim>cvs -d \cvs_repository tag -r brach_base -b abranch
cvs tag: Tagging .
T test.txt

C:\cvs-test\jim>cvs up -r abranch
cvs update: Updating .

C:\cvs-test\jim>echo branch changes>>test.txt

C:\cvs-test\jim>cvs ci -m "branch changes" test.txt
Checking in test.txt;
\cvs_repository/cvs-test/jim/test.txt,v  <--  test.txt
new revision: 1.2.2.1; previous revision: 1.2
done

C:\cvs-test>cvs up -A jim
cvs update: Updating jim
U jim/test.txt

C:\cvs-test>cvs up -j abranch jim
cvs update: Updating jim
RCS file: \cvs_repository/cvs-test/jim/test.txt,v
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into test.txt


What version of client and server are you using?

--
Jim