Keeping two repos in sync

2012-09-09 Thread David Chanters
Hi all, I'm wondering how best to go about this problem. I've got two separate git repositories -- one is a portable version which I'll call portable, the other is part of a BSD project, which I'll call bsd. Both repositories have the same set of *conceptual* files in them, it's just that the

Re: Keeping two repos in sync

2012-09-09 Thread David Chanters
Hi, On 9 September 2012 09:36, Andreas Schwab sch...@linux-m68k.org wrote: Add bsd as a remote in portable and cherry-pick each commit in bsd. I am already kind of doing this at the moment. Hence: 1. In portable, I have: % git remote add bsd /path/to/bsd/repo % git fetch bsd 2. At this

Using git-replace in place of grafts -- and publishing .git/refs/replace between repos?

2012-09-15 Thread David Chanters
Hi, Earlier this month I asked how best to handle two branches without a common ancestor to sync changes from one branch to another. Initially I did this via the grafts mechanism, but this wasn't a shared solution, in that the graft was local to my checkout of the repository and no one else's.

Re: Using git-replace in place of grafts -- and publishing .git/refs/replace between repos?

2012-09-15 Thread David Chanters
Hi, On 15 September 2012 18:21, Junio C Hamano gits...@pobox.com wrote: David Chanters david.chant...@googlemail.com writes: 2. If I do publish it, are there any caveats with that? i.e., because the replace data will likely point to a repo which in my working checkout I added with git