[Toybox] git

[Georgi Chorbadzhiyski]

On 4/5/15 8:07 PM, Rob Landley wrote:
>> On 04/04/2015 02:12 PM, enh wrote:
>>> is the "move to git, treat AOSP as upstream for toys/android/"
>>> definitely the plan? should i start committing fixes/additions to
>>> toys/android/ directly to AOSP instead of sending them to you?
>>
>> *sigh* Yeah, I suppose so.
>>
>> (It's the "move from mercurial to git" part that's awkward for me. The
>> rest I'm all for...)
>>
>> Lemme take a stab at getting a git repo up this weekend. (Probably on
>> github.com/landley if I can dig up my password there, using a clone of
>> georgi's repo. Then I need to poke Georgi and get him mirroring the git
>> instead of the mercurial or merges get screwy...)
>>
>> Rob
> 
> I cloned Georgi's mirror and pushed it to
> http://github.com/landley/toybox. I can start updating that, but if I do
> that without updating mercurial Georgi's version won't get the changes,
> and right now that's the version everyone's pulling from. (And if I
> check it in both places and it get converter from mercurial _and_
> separately checked into git, merges become... interesting.)
> 
> Georgi: could you have your mirror pull from my github repo instead of
> from mercurial?

Not a problem, it is set up.

I think would do the trick:

gf at gf:~/git/toybox$ git remote -v
hg	.git/hgremote (fetch)
hg	.git/hgremote (push)
landley	git://github.com/landley/toybox.git (fetch)
landley	git://github.com/landley/toybox.git (push)
origin	git://github.com/gfto/toybox.git (fetch)
origin	git at github.com:gfto/toybox.git (push)

gf at gf:~/git/toybox$ cat ./SYNC
#!/bin/sh

cd $(dirname $0)

git fetch -a
git merge landley/master
git push origin --tags

-- 
Georgi Chorbadzhiyski | http://georgi.unixsol.org/ | http://github.com/gfto/

 1428268246.0