Re: cvs branch

2003-06-20 Thread Andre Poenitz
On Fri, Jun 20, 2003 at 03:52:22PM +0100, John Levon wrote: > On Fri, Jun 20, 2003 at 04:51:56PM +0200, Andre Poenitz wrote: > > > I thought there is one? > > The branch tag is a different thing from a point tag. I didn't see what > command you typed to branch off ... As Lars suggested: cvs ta

Re: cvs branch

2003-06-20 Thread John Levon
On Fri, Jun 20, 2003 at 04:51:56PM +0200, Andre Poenitz wrote: > I thought there is one? The branch tag is a different thing from a point tag. I didn't see what command you typed to branch off ... john

Re: cvs branch

2003-06-20 Thread Andre Poenitz
On Fri, Jun 20, 2003 at 03:40:53PM +0100, John Levon wrote: > On Fri, Jun 20, 2003 at 04:36:50PM +0200, Andre Poenitz wrote: > > > So thius branching is essentially nothing else than a separate CVS > > repository and the merging has to be done manually? > > Uh no. It's a bit more awkward than it

Re: cvs branch

2003-06-20 Thread John Levon
On Fri, Jun 20, 2003 at 04:36:50PM +0200, Andre Poenitz wrote: > So thius branching is essentially nothing else than a separate CVS > repository and the merging has to be done manually? Uh no. It's a bit more awkward than it should be but it's definitely not manual. I'll do all the merges if you

Re: cvs branch

2003-06-20 Thread Andre Poenitz
On Fri, Jun 20, 2003 at 03:33:25PM +0100, John Levon wrote: > On Fri, Jun 20, 2003 at 03:41:29PM +0200, Andre Poenitz wrote: > > > Is it ok to 'cvs commit' as usual after creating this branch or do I have > > to do something special? > > The tricky bit is merging from the trunk onto the branch. W

Re: cvs branch

2003-06-20 Thread John Levon
On Fri, Jun 20, 2003 at 03:41:29PM +0200, Andre Poenitz wrote: > Is it ok to 'cvs commit' as usual after creating this branch or do I have > to do something special? The tricky bit is merging from the trunk onto the branch. We should do it regularly, and to do it right you need to move a tag alon

Re: cvs branch

2003-06-20 Thread Lars Gullik Bjønnes
Andre Poenitz <[EMAIL PROTECTED]> writes: | Is it ok to 'cvs commit' as usual after creating this branch or do I have | to do something special? Just check that in the tree that you want to commit in, have a file "Tag" in the CVS dir. This "Tag" contents should then be "BRANCH_NOUPDATE" --

Re: cvs branch

2003-06-20 Thread Jean-Marc Lasgouttes
> "Andre" == Andre Poenitz <[EMAIL PROTECTED]> writes: Andre> Is it ok to 'cvs commit' as usual after creating this branch or Andre> do I have to do something special? You can work as usual. JMarc

Re: cvs branch document

2002-05-31 Thread Angus Leeming
On Friday 31 May 2002 9:39 am, Lars Gullik Bjønnes wrote: > Angus Leeming <[EMAIL PROTECTED]> writes: > | On Friday 31 May 2002 9:21 am, Lars Gullik Bjønnes wrote: > >> I need the original one "Better use of CVS" > >> > >> Can someone please send it to me? > | > | development/branches.html > > I a

Re: cvs branch document

2002-05-31 Thread Lars Gullik Bjønnes
Angus Leeming <[EMAIL PROTECTED]> writes: | On Friday 31 May 2002 9:21 am, Lars Gullik Bjønnes wrote: >> I need the original one "Better use of CVS" >> >> Can someone please send it to me? > | development/branches.html I also found it in my mailbox. -- Lgb

Re: cvs branch document

2002-05-31 Thread Angus Leeming
On Friday 31 May 2002 9:21 am, Lars Gullik Bjønnes wrote: > I need the original one "Better use of CVS" > > Can someone please send it to me? development/branches.html