Boost logo

Boost :

From: Rene Rivera (grafikrobot_at_[hidden])
Date: 2006-06-26 19:40:56

Fernando Cacciola 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.

It's only expected if you merge anything more that just your files.

> If it is, is it OK to just commit my files and not the others?

I wouldn't risk it as errors in those other files might mask real
problems in your code, or the interaction of your code with others, etc.

I would suggest going back and doing the merge only with the files you

> What about the tag?

You only move the tag for the files you merged.

-- Grafik - Don't Assume Anything
-- Redshift Software, Inc. -
-- rrivera/ - grafik/
-- 102708583/icq - grafikrobot/aim - grafikrobot/yahoo

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