openshot.developers team mailing list archive

[TJ <ubuntu@xxxxxxxxxxx>]

On Sat, 2009-08-29 at 20:12 -0500, Jonathan Thomas wrote:
> TJ,
> I would very much like to start integrating your changes into the main
> trunk, so we can keep this manageable.  I'm beginning to get worried
> that you are going to send me a hundred different patches, and this is
> going to get very complicated.

That's partly my concern too, but what I'm doing is mostly outside of
things you'll be doing with the exception of the "~/.openshot/" issues
(which are easy to sort out).

What I don't want to do is send you patches that you commit until I'm
positive I've got it all correct.

Once I'm happy my changes are correct I'll rebase my changes on top of
your latest trunk and resolve any conflicts in discussions with you.

At that point I can split out the patches into lots, commit them to my
local repository, and then push them up to my branch on LP.

The patches will roughly be grouped as follows:

1. The pure Debian packaging - which is a new "debian" branch (don't
think it should be merged into trunk) and won't affect any existing
code.

2. Relocations: directories that have moved (e.g. main/classes/ ->
main/openshot/classes/)

3. Deletions (e.g. main/OpenShot.py morphing into
main/openshot/openshot.py, the install/ directory)

4. New directories and files (e.g. bin/launcher, xdg/openshot.desktop,
etc.)

5. Refactored relative path handling (quite invasive but clean)

6. Additional DEBUG support code

I'll split them down into small logical commits to make it easy for you
to review the changes.