On Fri, Jul 21, 2000 at 09:14:37AM -0400, Noel L Yap wrote:
> [EMAIL PROTECTED] on 2000.07.20 17:01:01
> >On Thu, Jul 20, 2000 at 03:45:45PM -0400, Noel L Yap wrote:
> >> Maybe I need to go over why I want to do this. At some point in the past, I
> >> gave out some of our source code. The developer has made some changes to
> that
> >> source code. I now want to integrate those changes.
> >>
> >> The easiest way I can think of is:
> >> cvs up -r 1.1 file
> >> vi CVS/Entries # manually remove sticky tag
> >
> >There's a MUCH easier way. Use a branch.
> >
> >Assuming you tagged the version this other developer used:
> >cvs tag -b -r TAG TAG_branch
> >cvs up -r TAG_branch
> >[overlay his changes]
> >cvs commit -m "Joe's changes"
> >cvs up -A
> >cvs up -j TAG -j TAG_branch
> >cvs commit -m "integrated Joe's changes"
>
> How is this MUCH easier??? What I gave has two steps (per file) and assumes
> nothing. IMO, it'd be much easier to patch "cvs up -r <rev> -A" and "cvs up -D
> <date> -A" than to do what you suggest.
Well, if the assumption about the tag is wrong, it's not too hard to fix.
You *still* have to figure out what version of each file was used as the
base. You can just as easily use that list to assign a tag as you can to
check out a revision of each file. Which you would probably want to do
anyway, just in case you make a mistake and need to start over. The tag
would be darn handy in that case.
Also, my method gets a copy of the files as supplied from the developer
into the repository as is (modulo $Id$ type of stuff). If this is not of
importance to you (for, say, review), then follow the other suggestion
(Larry's?) of just doing cvs up -r tag ; copy in supplied files; cvs up
-A ; cvs commit.
And it's not two steps per file.
cvs up -r rev file
[copy over file]
cvs up -A
cvs commit
I count that as four steps.
What did mine give you? Seven steps? Those three extra steps give you the
added benefit I mentioned above.
mrc
--
Mike Castle Life is like a clock: You can work constantly
[EMAIL PROTECTED] and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc
We are all of us living in the shadow of Manhattan. -- Watchmen
