Re: working on branch and trunk

[Eric Van Buggenhaut]

On Fri, Jun 01, 2001 at 02:25:41PM -0400, Adam Di Carlo wrote:
> Eric Van Buggenhaut <[EMAIL PROTECTED]> writes:
> 
> > Glad to know that. Until now, I used to update both potato and woody versions
> > against canonical english files. Should I thus drop woody for now ?
> 
> If you're working on changes to sync to potato, then work in the
> potato branch.  
> 
> If you're working on changes to sync the docs to woody, then work on
> the HEAD.

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 ?

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
:-)


[...]

> 
> Generally folks who are not me should not be touching tags at all.  We
> only tag when we release.

OK, I promise I won't tag.

-- 
Eric VAN BUGGENHAUT

[EMAIL PROTECTED]


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