Re: tomcat5.5, 6.0 and version control
Hi
On Tue, Nov 14, 2006 at 10:59:44AM -0500, Barry Hawkins wrote:
> Marcus Better wrote:
> > Hi,
> >
> > I'm working on squashing some ugly bugs in tomcat5.5, and right now I've
> > just about had enough with the patch system. I have better things to do
> > with my time than regenerating patches and sorting out conflicts for every
> > little change. I feel that the complexity of the package has outgrown the
> > patch system.
> >
> > So I'm simply going to make a branch in svn and work in there, with the full
> > source tree and no patches. (IMHO that is what version control systems are
> > for.) Then I will provide the result for review before uploading.
> [...]
> Marcus,
> Thanks for all your recent work in the Debian Java project. I am
> trying to comprehend the approach you seem to be suggesting. Are you
> proposing here that you are going to place the Tomcat source under
> version control and then make your orig.tar.gz from that? If so, then I
> guess you'll be building and uploading the full source, which, if I
> understand Debian Policy, will put it in the NEW queue every time an
> upload is sponsored. Also, if you indeed plan to work on upstream
No you can place it in a versioning sytem and use normal .orig files.
See util-vserver that is placed in subversion and horde3 (imp4 etc in
the same suite) that is placed in tla. Both placed on alioth. util-vserver
use the automatic patch system as it do not have proper merge support.
You can use svn-buildpackage or tla-buildpackage and just place the
.orig file in the directory below as usual. No need to worry there.
> source snapshots, how frequently you plan to reintroduce updated source
> from upstream and start modifying again for yourself? Are you proposing
> to merge your changes made to previous upstream snapshots into the
> newly-introduced ones? It seems you are trading the work of a
> time-tested, proven packaging method for a far more fragile and
> laborious process. If you feel that Tomcat has "outgrown the patch
> system", may I suggest taking a look at the xorg or linux-image packages?
It is quite a mature way of working. I have done it for quite some time
now. Can not remember when I switched for some of the co-maintained
packages.
> > Once this is done I would like to look at Tomcat 6, which is in alpha, but
> > we could make preliminary packages. However I'd like to have proper version
> > control from the start, and preferably a VCS with proper merging support.
> [...]
> Are you suggesting here that Subversion is not a version control system
> with "proper merging support"? If so I'd say that myself and a number
> of the other Debian Java project members disagree.
If you want good merge support, then use tla. I can send you the guide
that I use myself if you want.
But personally I actually just work with the source archive in the
"normal" way for the packages that I do not maintain with others.
You can always cut and paste from the diff.gz file that is automatically
generated. See my other mail for reasons about this.
Regards,
// Ola
> Regards,
> --
> Barry Hawkins
> All Things Computed
> site: http://www.alltc.com
> weblog: http://www.yepthatsme.com
>
> Registered Linux User #368650
>
>
>
> --
> To UNSUBSCRIBE, email to debian-java-REQUEST@lists.debian.org
> with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
>
>
--
--------------------- Ola Lundqvist ---------------------------
/ opal@debian.org Annebergsslingan 37 \
| opal@lysator.liu.se 654 65 KARLSTAD |
| +46 (0)54-10 14 30 +46 (0)70-332 1551 |
| http://www.opal.dhs.org UIN/icq: 4912500 |
\ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 /
---------------------------------------------------------------
Reply to: