Another alternative is to continue using kalibrator and write a simple
script that updates your calibre fork from kalibrator and submits a pull
request. Something like:

copy-updates::
#!/bin/sh
cp kalibrator/*.recipe calibre/recipes/
cd calibre
git commit -am $1
git push
git pull-request (you need to install hub for this)

So now when you want to send me updates, you just do:
copy-updates

Otherwise, I suggest just go with a calibre fork, that's the most maintainable
solution going forward. Previous history, if it is really needed, can
remain available in the kalibrator repo. 


Kovid.

On Mon, Jun 03, 2013 at 06:43:24AM -0000, Tomasz Długosz wrote:
> On Jun 3, 2013 3:52 AM, "Kovid Goyal" <email address hidden> wrote:
> >
> > I'd rather not do that. It adds an extra thing to remember both for me
> > and for other people, as sometimes there are commits that affect both
> > the recipes/ directory and files outside it as well. For instance this
> > commonly happens when I run python setup.py check on the whole tree
> > before making a release.
> 
> I see.
> 
> >
> > Regarding kalibrator, what is the problem exactly? If the issue is that
> > some recipes are ignored in the global .gitignore I can always move
> > those ignores into .git/info/exclude.
> 
> No, it's not a matter of ignored files (I can have them in another branch),
> but rather a question of whether it is possible to have both
> 1. History (and if possible simple layout) of kalibrator preserved
> 2. Ability to request merges directly to your calibre branch.
> 
> The second point seems more important to me.
> 
> Probably the ultimate solution will be to make kalibrator repo obsolete,
> and just work from a normal calibre fork, but I'm still not sure.
> 
> >
> > Kovid.
> >
> > On Sun, Jun 02, 2013 at 07:01:24PM -0000, Tomasz Długosz wrote:
> > > Thanks, I just didn't notice you already did the switch.
> > >
> > > Did you consider making recipes a subtree?
> > > https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt
> > >
> > > I did a quick check. In my fork of the calibre repo I've added a subtree
> > > "recipes" (the recipes directory was removed just before that step) that
> > > follows the repo kalibrator that used to be used for deveoping polish
> > > recipes. This allows people to add their recipes only by cloning a small
> > > part of the original calibre repo, while a clone of full calibre repo
> still
> > > incorporates the recipes directory (that means this is transparent for
> > > people not tinkering in recipes directory).
> > >
> > > Should you use this idea, you probably should make a split in calibre
> repo
> > > (git subtree split -P ), and not add my repo as an alien subtree :D . I
> did
> > > my check to see whether I can preserve my repo's history during the
> > > transition to subtree (still trying to find a way to adopt the
> kalibrator
> > > to calibre being hosted on github :D ).
> > >
> > > Regards,
> > > Tomasz
> > >
> > >
> > > On 2 June 2013 03:53, Kovid Goyal <email address hidden> wrote:
> > >
> > > > calibre development has moved to GitHub, see
> > > > http://www.mobileread.com/forums/showthread.php?t=214465
> > > >
> > > > I have merged this patch into master on GitHub.
> > > > --
> > > > https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> > > > You are the owner of lp:~tomek3d/calibre/store.
> > > >
> > >
> > > --
> > > https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> > > You are requested to review the proposed merge of
> lp:~tomek3d/calibre/store into lp:calibre.
> > >
> > > 
> > >
> > >
> >
> > --
> > _____________________________________
> >
> > Dr. Kovid Goyal
> > http://www.kovidgoyal.net
> > http://calibre-ebook.com
> > _____________________________________
> >
> > https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> > You are the owner of lp:~tomek3d/calibre/store.
> 
> -- 
> https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> You are requested to review the proposed merge of lp:~tomek3d/calibre/store into lp:calibre.
> 
> !DSPAM:3,51ac3b0d281105802913117!
> 
> 

-- 
_____________________________________

Dr. Kovid Goyal 
http://www.kovidgoyal.net
http://calibre-ebook.com
_____________________________________