It's likely that there is a mismatch of file formats. UNIX text files ends with a single \r character, while Windows ones ends with two: <CR><LF>. Make sure you use the UNIX format to check out the files (a CVS option), as it's probably the format of the files in the CVS repository. On 6/26/06, Fernando Cacciola <fernando_cacciola@hotmail.com> wrote:
Hi,
I must be doing something wrong or I'm expecting something I shouldn't:
(1) I updated from the trunk (HEAD) (2) Fixed a couple of things (3) Commited to the trunk (4) Updated from RC_1_34 (over the same working folder) (5) Merged "merged_from_RC_1_34" and "HEAD" into working folder.
For step 5 I'm using ToroiseCVS 1.8.26 using the merge dialog as follow:
Start: merged_from_RC_1_34 End: HEAD
After that I get lots of updated, and even conflicted, files, way beside those which are mine.
Is that expected? I figured I would get only my files merged.
If it is, is it OK to just commit my files and not the others?
What about the tag?
TIA
Fernando Cacciola
_______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost