[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: upgrading cvs and merging branches
From: |
Jim.Hyslop |
Subject: |
RE: upgrading cvs and merging branches |
Date: |
Mon, 6 Dec 2004 10:00:20 -0500 |
Donald Skidmore wrote:
> I have two questions:
> I created a branch using: cvs tag -b -r v1.2 v1.2-patches myfile.c
> I then did cvs up -r v1.2-patches myfile.c
> I modified the file and did a commit
> I then did a cvs up -j v1.2-patches and it should the file was merged.
> followed by a cvs up -A and finally a cvs up -r v1.2 myfile.c
> myfile.c had the original code and not the modifications I
> made to the patch tag why?
Do the 'cvs up -A' and *then* do the merge.
The '-j' options tell CVS "Take the difference between the revisions
specified by -j and apply them to my working copy". Since your working copy
already had the changes, CVS had nothing to do.
> My second question:
> We have a very old version 1.11.1p1 running on a solaris box. My
> question is what precautions and gotchas do I have to worry about
> migrating to the latest version which I believe is 1.11.18.
I don't believe you will experience any problems. Of course, step #1 is
always "back up the repository" so if you do run into problems, you can back
out your changes and not lose anything.
--
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. ( http://www.leitch.com )
Columnist, C/C++ Users Journal ( http://www.cuj.com/experts )