[Pkg-crosswire-devel] Which files to keep in bzr, and merging

[Dmitrijs Ledkovs]

2009/1/31 Jonathan Marsden <jmarsden at fastmail.fm>:
> I think my packaging stuff for both biblememorizer (at
> lp:~jmarsden/biblememorizer/jmarsden) and bibledit ( at
> lp:~jmarsden/bibedit/jmarsden) is now fairly decent, and should be
> merged to lp:~pkgcrosswire/biblememorizer/main and
> lp:~pkgcrosswire/bibledit/main respectively.
>
> Then we can encourage all on the team to test it :)
>
> However, I have two questions first:
>
> (1) We seem to have a lot of source code (not just /debian, but the
> stuff from the original tarball) in there... is that
> wise/sane/reasonable?  Or should we just keep /debian under DVCS, which
> is what I thought we were going to be doing (and is what my personal
> branches do)?  Carrying all the original code, which by definition we
> should not be editing, in our VCS seems like overhead we don't need...
> but I may be missing something?
>

That's kind of been a flame war =DDD Some don't like to have the upstream source code
some do!

I'm for having the upstream source in the repo

1) Patch systems especially quilt need source code.

2) I want to just do and have the full thing bzr buildeb
lp:~anyone/project/whizbang

3) If you have upstream source in front of your eyes it's more tempting to start
digging it, find bugs and submit patches upstream.

4) bzr status and dpkg will tell at you if you have source modifications! Plus
you can use bzr clean-tree (from bzrtools plugin) if you want start
experimenting with the build without exporting it to the build directory.

5) Dpkg soon (After lenny) will be able to
kind of ditch the source package. One of the source packages will be bzr repo =D

For example: package-import.ubuntu.com - imports all ubuntu packages into bzr
branches. Soon this will be migrated to launchpad At UDS one guy (lp developer)
said if you already have debian/ in DVCS why not have the whole source code as
well. Small difference in Performance/Space but gain in tools and workflows.

Python-apps Packaging Team - they store only debian/ in their svn/ directory
Python-modules Packaging Team - they store source as well.

> (2) Do we need any kind of "get someone else to check your work before
> doing a merge to main" guideline, or are we going to trust ourselves not
> to break things too badly, and so allow any one team member to merge our
> own stuff into main?  Looks like the latter is what is technically
> possible at this stage...
>

I would love to get my work reviewed by peers! And I will review others
people. So that we can learn from each other =D And be consistent.

> Jonathan


-- 
With best regards


Ледков Дмитрий Юрьевич

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 270 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-crosswire-devel/attachments/20090131/f553eb70/attachment.sig>