[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-dev
Subject:    Re: upgrading CVS
From:       Henrik Nordstrom <hno () hem ! passagen ! se>
Date:       2000-04-17 0:36:33
Message-ID: 38FA5C91.35C57350 () hem ! passagen ! se
[Download RAW message or body]

Henrik Nordstrom wrote:

> And you most likely also want to use -kk to avoid conflicts only due to
> RCS keywords.. I forgot about this one as I have all my sourcetrees
> checked out using -kk.


I apparently were smarter than I thought when I wrote cvsmergeinit.

1. Go to your working directory

2. Run "cvsmergeinit devel s2_3_s1"

3. Run "cvsmerge devel 2>&1 | tee merge.log" to update the sources

4. Fix the conflicts

5. "cvs commit"


I have now commited a new version of cvsmergeinit to the web site, which
explains it's usage a bit more.

/Henrik

[prev in list] [next in list] [prev in thread] [next in thread]