cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Donald Ball <ba...@webslingerZ.com>
Subject Re: AW: Commiting on 2.0 branch and HEAD
Date Fri, 08 Jun 2001 15:48:20 GMT
On Fri, 8 Jun 2001, Carsten Ziegeler wrote:

> > Now that we've got two branches for C2, what's the easiest way to commit
> > changes on both ? I made two checkouts (HEAD and cocoon_20_branch) : do
> > I have to manually copy modified files from one checkout to the other
> > and issue 2 commits, or is there a way to commit on both branches at
> > once ?
> >
> I think the only working solution is to make two commits. This is some
> overhead we have to cope with but I think it's unavoidable.
>
> My question is: Should we keep both branches in sync until we release
> the 2.0 final? I think we should, so I would suggest to really make
> always two submits.
> What do you all think?

yes, unless the commit is adding new potentially unstable code in which
case it should just go in the 2.1/HEAD branch. managing two branches like
this is a real pita.

- donald


---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org


Mime
View raw message