Boost logo

Boost :

From: Fernando Cacciola (fernando_cacciola_at_[hidden])
Date: 2006-06-26 18:06:43


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

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?


Fernando Cacciola

Boost list run by bdawes at, gregod at, cpdaniel at, john at