Re: working on branch and trunk

[Eric Van Buggenhaut]

On Thu, May 31, 2001 at 04:28:54AM -0400, Adam Di Carlo wrote:
> Eric Van Buggenhaut <[EMAIL PROTECTED]> writes:
> > What do you mean 'French merge rolled back' ?
> 
> I could not merge changes in 2.2.23 and 2.2.24 from potato onto the
> woody version.  They conflicted.
> 
> I dunno.  In general, if you are fixing something for Potato, it's
> best not to fix it again in woody, since the branch merge would roll
> those changes in.

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 ?

> 
> > Apparently, I got files correctly marked as belonging to potato
> > branch but they aren't tagged. Is it right ?
> 
> Um, no, I didn't say that.

Sorry, what i meant was : Is it normal the files I commit don't wear tags ?

> 
> > Also, what mark of fertilizer do you usually use ?
> 
> Eh?  I don't have any garden... :)

Neither do I, that's why I feel a bit lost.

-- 
Eric VAN BUGGENHAUT

[EMAIL PROTECTED]


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