[Pkg-shadow-devel] Policy for patches in the sid branch
Alexander Gattin
arg@online.com.ua
Thu, 14 Apr 2005 23:34:17 +0300
Hi!
On Thu, Apr 14, 2005 at 11:48:03AM +0200, Nicolas François wrote:
> * a new temporary directory is created and a new shell is invoked
> in this directory (by dpatch-edit-patch).
> I'm doing my modifications there.
> * then I exit from this new shell
> * and dpatch-edit-patch automagically creates the
voila!
:^)
If you didn't tell this, I'd probably use
`cvs diff/rdiff`, vim and dpatch-convert-diffgz :)
> Maybe we could just list the patches for 31sarge2 in 00list, so that
> dpatch apply-all will generate 31sarge2, and applying all additional
> patches not present in 00list would generate post-32.
We can have a SARGE branch in addition to SID (just for
00list and changelog? maybe more easy is simply to have
SARGE branch for all pkg-shadow/sid/ subdir).
All current patching/fixing should be done in SID and
occasional changes propagate into pkg-shadow/sarge/
subdir and SARGE branch of pkg-shadow/sid/.
That's what I propose. If we choose this method, I can
elaborate on/help with keeping multi-branch CVS if you
are not yet familiar with such matters.
> I modified the changelog in the patch. But now I think it wasn't a good
> idea (it force the application of the the dpatch in the right order).
> A temporary debian/changelog-post32 seems better.
Maybe just branched/forked?
P.S. Also, what is the policy for patching
Debian-specific stuff, like remove-shell? I just
changed the file in CVS under pkg-shadow/sid/
directory.
We should rather document this.
--
WBR,
xrgtn