[Pkg-tikiwiki-devel] svn layout

[Marcus Better]

Hi,

I'm in the process of importing Tikiwiki 1.9.4 into the svn repository
on Alioth.

This raises the question of how to handle Debian-specific changes. I
definitely want to get rid of dpatch which has a horrible way of
updating patches (making a copy of the whole working tree etc) and is
lousy at conflict resolution (which I learned while updating from 1.9.2).

quilt is slightly better on the first count, but similarly difficult on
the second.

The current best practice seems to be to use "feature" and "integration"
branches. Each "feature", or Debian-specific changeset with a logically
related set of changes, gets a special branch. The "debian" directory is
a feature. The other features would roughly correspond to the current
dpatches.

When a release is made, the feature branches are all merged onto the
integration branch (or trunk).

I believe this is the most maintainable way to handle it. It is also the
only way that supports distributed development so people can work
simultaneously without breaking each others patches.

Unless there are significant objections I'll go ahead with this scheme...

Marcus

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: OpenPGP digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-tikiwiki-devel/attachments/20060710/60b1118e/signature.pgp