Re: working on branch and trunk

[Adam Di Carlo]

Eric Van Buggenhaut <[EMAIL PROTECTED]> writes:

> That's what I did until now but then you couldn't merge french potato into
> woody. AFAIU, changes in woody docs are mainly merges from potato branch, am I
> right ?

cvs2cl -r -t -b will tell you.

> Also is there a point of working on the docs for woody if they are replaced
> later by potato's stuff (when merging) ? I don't feel like doing the job twice
> :-)

I wouldn't suggest trying to work on both at once.  Just pick one or
the other to work on.  I would suggest potato.

FYI, you might have to pester me to do branch merges.

-- 
.....Adam Di [EMAIL PROTECTED]<URL:http://www.onshored.com/>


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]