AW: AW: Commiting on 2.0 branch and HEAD

2001-06-10 Thread Carsten Ziegeler
> Ovidiu Predescu wrote: > > On Fri, 8 Jun 2001 12:00:56 +0200, "Carsten Ziegeler" > <[EMAIL PROTECTED]> wrote: > > > > Giacomo Pati wrote: > > > > > > There are some drawback to this procedure. > > > 1. Lots of merge conflict will happen because of keyword > expansion we use > > >in the sourc

Re: AW: Commiting on 2.0 branch and HEAD

2001-06-10 Thread Ovidiu Predescu
On Fri, 8 Jun 2001 12:00:56 +0200, "Carsten Ziegeler" <[EMAIL PROTECTED]> wrote: > > Giacomo Pati wrote: > > > > There are some drawback to this procedure. > > 1. Lots of merge conflict will happen because of keyword expansion we use > >in the source files ($Revision 1.2.1.$ etc.). Using the

Re: AW: Commiting on 2.0 branch and HEAD

2001-06-08 Thread Donald Ball
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, o

Re: AW: Commiting on 2.0 branch and HEAD

2001-06-08 Thread Sylvain Wallez
Carsten Ziegeler a écrit : > > > Giacomo Pati wrote: > > > > Quoting Carsten Ziegeler <[EMAIL PROTECTED]>: > > > > > > Sylvain Wallez wrote: > > > > > > > > Hi cocooners, > > > > > > > > Now that we've got two branches for C2, what's the easiest way to > > > commit > > > > changes on both ? I m

AW: Commiting on 2.0 branch and HEAD

2001-06-08 Thread Carsten Ziegeler
> Giacomo Pati wrote: > > Quoting Carsten Ziegeler <[EMAIL PROTECTED]>: > > > > Sylvain Wallez wrote: > > > > > > Hi cocooners, > > > > > > 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

Re: AW: Commiting on 2.0 branch and HEAD

2001-06-08 Thread Giacomo Pati
Quoting Carsten Ziegeler <[EMAIL PROTECTED]>: > > Sylvain Wallez wrote: > > > > Hi cocooners, > > > > 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 fil

AW: Commiting on 2.0 branch and HEAD

2001-06-08 Thread Carsten Ziegeler
> Sylvain Wallez wrote: > > Hi cocooners, > > 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 th