XSF logo XSF Discussion - 2011-04-25


  1. Tobias has joined
  2. Tobias has left
  3. Tobias has joined
  4. Tobias has left
  5. bear has left
  6. Ludovic has joined
  7. Ludovic has left
  8. Tobias has joined
  9. Tobias has left
  10. Tobias has left
  11. Tobias has left
  12. Tobias has left
  13. Tobias has left
  14. Tobias has left
  15. Tobias has left
  16. Tobias has left
  17. luca tagliaferri has joined
  18. Ludovic has joined
  19. Ludovic has left
  20. luca tagliaferri has left
  21. bear has joined
  22. Tobias has left
  23. Neustradamus has left
  24. Neustradamus has joined
  25. Tobias has left
  26. Tobias has left
  27. Tobias has left
  28. Tobias has left
  29. Tobias has left
  30. Tobias has left
  31. Tobias has left
  32. Tobias has left
  33. stpeter has joined
  34. Tobias has left
  35. Tobias has joined
  36. Tobias has left
  37. Tobias has joined
  38. Tobias has left
  39. Tobias has joined
  40. Tobias has left
  41. Tobias has joined
  42. Tobias has left
  43. Tobias has joined
  44. Tobias has left
  45. Tobias has joined
  46. Tobias has left
  47. Tobias has joined
  48. Tobias has left
  49. Vanaryon has joined
  50. Vanaryon Hi!
  51. Kev Evening.
  52. Vanaryon Kev, hi ;)
  53. Vanaryon 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
  54. stpeter Vanaryon: ok, now I need to figure out how to manage gitorious appropriately because I've never done that before :)
  55. Vanaryon it might be a simple web interface button click ;)
  56. Kev Vanaryon: We don't host on gitorious, so it's not.
  57. stpeter sounds like an iteam issue
  58. stpeter or at least an instructional issue, where I am the instructee ;-)
  59. Kev 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
  60. Kev Then just push the commit in the usual way.
  61. stpeter ah
  62. Kev There are assorted other ways of dealing with this.
  63. Kev So shout if that one doesn't work for you and I'll tell you another :)
  64. stpeter ok
  65. Vanaryon Kev, okay, I thought
  66. Kev You could for example do git rebase vanaryon/master git rebase origin/master
  67. Kev instead of dealing with commit hashes.
  68. stpeter Vanaryon: did you see http://mail.jabber.org/pipermail/standards/2011-April/024431.html ?
  69. Kev (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)
  70. Vanaryon stpeter, yep
  71. Vanaryon I applied a part of this
  72. Vanaryon (section 2 of the mail)
  73. stpeter Vanaryon: ok, I didn't see a reply on the list, but perhaps you've updated the XEP to address that feedback
  74. Vanaryon for the first one, I have not seen yet how to do it
  75. Vanaryon stpeter, yes
  76. stpeter ok great
  77. Vanaryon In fact, I am not subscribed all the time to the standards@ to keep a "clean" inbox ;)
  78. Vanaryon I am not very mail-addicted ;)
  79. stpeter wimp :)
  80. Tobias has joined
  81. Kev I believe if one is editing XEPs, one should be on the standards list.
  82. Vanaryon I just subscribe to the list when I have something to post to it, and wait for a reply
  83. Vanaryon Kev, yep, that's true
  84. Kev It's not so high-volume that it's impossible to filter out the threads that're irrelevant.
  85. Vanaryon has left
  86. Vanaryon has joined
  87. Vanaryon has left
  88. Vanaryon has joined
  89. Tobias has left
  90. Vanaryon has left
  91. Neustradamus has left
  92. Neustradamus has left
  93. Neustradamus has left
  94. Neustradamus has left
  95. Tobias has joined
  96. Neustradamus has left
  97. stpeter has left
  98. bear oh poo - I can't log onto the gsoc mailing list to approve the new subscribers
  99. bear can someone remind me what the list admin password is since I seem to have forgotten it :(
  100. bear sends iteam email
  101. Tobias has left
  102. Tobias has joined
  103. Tobias has left
  104. Neustradamus has joined