httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Richards <p...@originat.demon.co.uk>
Subject Re: cvs commit: apache/src httpd.h
Date Wed, 03 Jul 1996 23:12:05 GMT
In reply to Paul Richards who said
> 
> paul        96/07/03 15:55:05
> 
>   Branch:      src       RELEASE_1_1_X
>   Modified:    src       httpd.h
>   Log:
>   Change version to 1.1.1-dev for 1.1.X branch
>   
>   Revision  Changes    Path
>   1.36.2.1  +1 -1      apache/src/httpd.h

Patches don't appear for the branch because the bit of magic I did for
this doesn't understand how to do the diffs with the previous file on
that branch.

I'm off for a break from afternoon 4 July my time until Monday, I'll look
at improving the magic next week.

The branch point is RELEASE_1_1, you can do diffs between the
branch and the head using

cvs diff -r RELEASE_1_1

assuming you've checked out the branch or

cvs diff -r RELEASE_1_1_x

if you've checked out the head.

I used RELEASE since Apache was used to place tags on the head at
various times. I think we can stick to that for marking significant
events on the head when we don't branch. We should use RELEASE_X_X
to mark the branch point of releases and RELEASE_X_X_X to mark the
actual branch. You need a branch point to be able to do diffs like
above otherwise you won't know where on the head the branch was
made.

-- 
  Paul Richards, Originative Solutions Ltd.
  Internet: paul@netcraft.co.uk, http://www.netcraft.co.uk
  Phone: 0370 462071 (Mobile), +44 1225 447500 (work)

Mime
View raw message