Re: Keeping two repos in sync

2012-09-09 Thread Andreas Schwab
David Chanters writes: > 2. At this point I scan the two branches looking for a point to > graft; I might have done this already in the past, but the point is > since grafting is a local operation and I am not working in that > repository, I might need to do it again anyway -- that graft > repre

Re: Keeping two repos in sync

2012-09-09 Thread David Chanters
Hi, On 9 September 2012 09:36, Andreas Schwab 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 point I scan th

Re: Keeping two repos in sync

2012-09-09 Thread Andreas Schwab
Add "bsd" as a remote in "portable" and cherry-pick each commit in "bsd". Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsu

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 th