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

[Jonathan Marsden]

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?

(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...

Jonathan