This one time, at band camp, [EMAIL PROTECTED] wrote: >I've been using CVS to do revision control on my own software. >Today I got a very nasty surprise when I found what appeared to be CVS >revision tags inside my file. I just use cvs commit, import >update and checkout, but I've never seen anything like this. Can anyone >help me out here, is my codebase about to go AWOL?
Looks like theres a conflict between your working copy and the repository, you need to resolve the conflict in your new working copy before checking in. The <<< === >>> lines tell you which came from where: your local copy of ra_coronalroigetmask.pro is in the first block of <<< ===, and the repository's version 1.4 of the file is in === >>> block. Choose which one you want and delete the rest. ><<<<<<< ra_coronalroigetmask.pro >FUNCTION ra_coronalroiGetMask, widgetData, roiID, EXISTS=exists, >ZOOM=scale, ONLY_INDS=only_inds, INDS=inds >verts = rt_roichooserGetVerts(widgetData.ROIchooser, roiID, ZOOM=scale) >======= >;L+ >;L- > >;+ >; This returns a mask of the ROI. 1 indicates the point is inside the >; ROI. >;- >FUNCTION ra_coronalroiGetMask, widgetData, roiID, EXISTS=exists >verts = rt_roichooserGetVerts(widgetData.ROIchooser, roiID) >>>>>>>> 1.4 I'm going to guess that someone checked in some comments :) -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
