[pkg-kolab] Publishing pykolab changes and/or merging them with pkg-kolab

[Paul Boddie]

Hello,

As those of you following the Kolab development list might know, I've been 
making changes to pykolab in order to support new functionality and Debian 
packaging. However, I'd really like to make my changes available in a 
convenient way, and in this regard I am looking for some advice.

At this point, I'm looking for a way to...

1. Publish changes to pykolab in the context of pkg-kolab with the idea of 
merging these downstream lines of development. (My changes plus pkg-kolab's 
packaging work, even though I also have updated packaging work elsewhere.)

2. Publish pykolab changes unmerged with pkg-kolab's changes for potential 
upstream adoption.

On the matter of (1), if I were working with Mercurial, I'd pull (fetch in git 
terminology) from the pkg-kolab repository for pykolab and thus have the 
somewhat independent histories in the same repository (and also be easily able 
to see them in a graphical log viewer), and then I would merge the branch 
heads. However, some sound advice to manage this situation in git is probably 
needed. An alternative, if I were doing things with Mercurial, would involve 
pushing my changes to a remote repository and letting someone else do the 
merge. ;-)

Any suggestions?

Paul

P.S. Or maybe I should abandon the pkg-kolab repository as published on 
anonscm.debian.org as being out-of-date.