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
Received on Sun Apr 16 2000 - 18:43:03 MDT
This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:12:23 MST