XSF Discussion - 2011-04-25

Hi!

Evening.

Kev, hi ;)

stpeter, I submitted a pull request on Gitorious, we added items geolocation from BuddyCloud's modified XEP, and fixed some stuffs from my personal experience of the XEP

Vanaryon: ok, now I need to figure out how to manage gitorious appropriately because I've never done that before :)

it might be a simple web interface button click ;)

Vanaryon: We don't host on gitorious, so it's not.

sounds like an iteam issue

or at least an instructional issue, where I am the instructee ;-)

stpeter: git add remote vanaryon uri:to:vanaryon's:repo git fetch vanaryon git log vanaryon (gets you the info) git cherry-pick hash-of-commit-you-want

Then just push the commit in the usual way.

ah

There are assorted other ways of dealing with this.

So shout if that one doesn't work for you and I'll tell you another :)

ok

Kev, okay, I thought

You could for example do git rebase vanaryon/master git rebase origin/master

instead of dealing with commit hashes.

Vanaryon: did you see http://mail.jabber.org/pipermail/standards/2011-April/024431.html ?

(The first will get vanaryon's commits into your local branch, but not necessarily in the right order, and the second will get them into the right order)

stpeter, yep

I applied a part of this

(section 2 of the mail)

Vanaryon: ok, I didn't see a reply on the list, but perhaps you've updated the XEP to address that feedback

for the first one, I have not seen yet how to do it

stpeter, yes

ok great

In fact, I am not subscribed all the time to the standards@ to keep a "clean" inbox ;)

I am not very mail-addicted ;)

wimp :)

I believe if one is editing XEPs, one should be on the standards list.

I just subscribe to the list when I have something to post to it, and wait for a reply

Kev, yep, that's true

It's not so high-volume that it's impossible to filter out the threads that're irrelevant.

oh poo - I can't log onto the gsoc mailing list to approve the new subscribers

can someone remind me what the list admin password is since I seem to have forgotten it :(