httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Marc Slemko <ma...@worldgate.com>
Subject Re: 2.0 and 1.3
Date Thu, 29 Jan 1998 00:36:27 GMT
But I don't understand the point of this.  If you are going to do this why
not just recreate 2.0 at that point?

2.0 will have major changse, so it isn't useful to make any commits until
we have an idea where we are giong...

On Wed, 28 Jan 1998, Jim Jagielski wrote:

> I was talking keeping the 2 in-sync only while we're working on
> 1.3 and have the 2.0 lie fallow.
> 
> Marc Slemko wrote:
> > 
> > If there are no conflicts then there is no point to having an active 2.0
> > repository and we may as well wait until later and recreate it with a
> > then-current tree...
> > 
> > On Wed, 28 Jan 1998, Jim Jagielski wrote:
> > 
> > > Dean Gaudet wrote:
> > > > 
> > > > How would it deal with conflicts?
> > > 
> > > Well, hopefully there wouldn't be any, since all I would be doing
> > > in putting the stuff commited to 1.3 into 2.0. In the case of
> > > true conflicts, however, it would require hand editing, but both
> > > "sides" of the code would be there.
> > > 
> > > > 
> > > > Dean
> > > > 
> > > > On Wed, 28 Jan 1998, Jim Jagielski wrote:
> > > > 
> > > > > Ian Kluft wrote:
> > > > > > 
> > > > > > > From: Jim Jagielski <jim@jaguNET.com>
> > > > > > > As dean noted, the 2.0 and 1.3 trees are already out of
sync. Unless
> > > > > > > someone else wants it, I'll fold the changes made to 1.3
into
> > > > > > > 2.0, but it will be in large blocks like every day or so.
 [...]
> > > > > > 
> > > > > > rcsmerge is your friend...  (In case you didn't already have
it in mind.)
> > > > > > 
> > > > > 
> > > > > Yeah... I was just going to setup a simple cron-job
> > > > > 
> > > > > 
> > > > > -- 
> > > > > ====================================================================
> > > > >       Jim Jagielski            |       jaguNET Access Services
> > > > >      jim@jaguNET.com           |       http://www.jaguNET.com/
> > > > >             "Look at me! I'm wearing a cardboard belt!"
> > > > > 
> > > > 
> > > > 
> > > 
> > > 
> > > -- 
> > > ====================================================================
> > >       Jim Jagielski            |       jaguNET Access Services
> > >      jim@jaguNET.com           |       http://www.jaguNET.com/
> > >             "Look at me! I'm wearing a cardboard belt!"
> > > 
> > 
> > 
> 
> 
> -- 
> ====================================================================
>       Jim Jagielski            |       jaguNET Access Services
>      jim@jaguNET.com           |       http://www.jaguNET.com/
>             "Look at me! I'm wearing a cardboard belt!"
> 


Mime
View raw message