I realize I should know the answer to this question by now, but how do I avoid the markup that occurs when updating changed files by cvs? For example in lib/matplotlib/numerix/fft/__init__.py I get this line following an update:
<<<<<<< __init__.py
at the moment I am updating matplotlib via:
cvs -q up -Pd
Thanks,
Chris
···
--
Christopher J. Fonnesbeck
Population Ecologist, Marine Mammal Section
Fish & Wildlife Research Institute (FWC)
St. Petersburg, FL
Adjunct Assistant Professor
Warnell School of Forest Resources
University of Georgia
Athens, GA
I realize I should know the answer to this question by now, but how do I avoid the markup that occurs when updating changed files by cvs? For example in lib/matplotlib/numerix/fft/__init__.py I get this line following an update:
<<<<<<< __init__.py
at the moment I am updating matplotlib via:
cvs -q up -Pd
cvs -q up -PCd
-C means get a Clean" copy:
Overwrite locally modified files with clean copies from the repository (the modified file is saved in .#file.revision, however).
That's what you do if you just want whatever the current version in the repository is. However, that markup is a how cvs handles conflicts on merge. If you haven't changed your copy, you shouldn't be getting any of that.
···
--
Christopher Barker, Ph.D.
Oceanographer
NOAA/OR&R/HAZMAT (206) 526-6959 voice
7600 Sand Point Way NE (206) 526-6329 fax
Seattle, WA 98115 (206) 526-6317 main reception