Skip to content

Instantly share code, notes, and snippets.

@c3mediagroup
Created May 6, 2009 09:16
Show Gist options
  • Save c3mediagroup/107449 to your computer and use it in GitHub Desktop.
Save c3mediagroup/107449 to your computer and use it in GitHub Desktop.
<HTML><HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8" />
<META NAME="generator" CONTENT="Skype" />
</HEAD><BODY>
<style type='text/css' media='all'> html { margin: 0; padding: 0; } head { display: none; } body { margin: 10px 10px 30px; padding: 0; font: normal 75% Tahoma, Verdana, Helvetica, sans-serif; color: #000; } h1 { font-size: 1.2em; font-weight: 600; margin: 0; } h2 { font-size: 1.2em; font-weight: 600; margin: 0; } h3 { font-size: 1.1em; font-weight: 600; } dl, dt, dd { margin: 0; padding: 0; width: auto; display: block; } dt { height: 20px; line-height: 20px; font-weight: bold; position: relative; } dt span { position: absolute; right: 0; top: 0; font-size: 0.8em; font-weight: normal; padding-right: 10px; } dd { margin: 0.5ex 0 1ex 10px; position: relative; } dd span { position: absolute; right: 0; top: 0; font-size: 0.8em; font-weight: normal; padding-right: 10px; } dt.remote { padding-left: 10px; background: #D5E6FF url(http://goodies.skype.com/graphics/chathistory/blue_left.png) left center no-repeat; } dt.remote span { background: #D5E6FF url(http://goodies.skype.com/graphics/chathistory/blue_right.png) right center no-repeat; } dt.local { padding-left: 10px; background: #DDD url(http://goodies.skype.com/graphics/chathistory/grey_left.png) left center no-repeat; } dt.local span { background: #DDD url(http://goodies.skype.com/graphics/chathistory/grey_right.png) right center no-repeat; } dt.info { background: #F0EAAA url(http://goodies.skype.com/graphics/chathistory/info_left.png) left center no-repeat; margin: 1em 0; height: 25px; line-height: 25px; text-align: center; font-weight: normal; padding-left: 30px; } dt.info span { position: relative; height: 25px; display: block; float: none; font-size: inherit; background: transparent url(http://goodies.skype.com/graphics/chathistory/info_right.png) right center no-repeat; padding-right: 30px; } dd dl { padding: 1em 0 1em 1em; }</style><a href='http://www.skype.com/' title='Visit the Skype website.'><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGkAAAAvCAMAAADXXRR5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwBQTFRF////AK/wYs72ML7zs+f6PcL0yu78vur6VMn1Rpq5atD2Aa/waND20/H8g9TyG5zLbdH2Usn1eNX3UaPCScb0Y872Lr3zb9L39fn6TaPDRcX0OLHeILnyZc/2ArDwXKG7GbfxJrvyCbLxHbjy8fr9TMf0XpuyScHtQbHccdL3GLPsNcDz6/L1XMz1XMbuj9z4n+H5Yc32KJrEEbTxKLzy5vf9Up66d8/vErXxS6zQDqXcf9X1NLrs3/X9VKC9pOP64vb9RK3Ucq3DOrzsEqzllt757/r+h9n4l8nbLrrue7LHTbriEaPaAq7tkdz4ZqvFOMHzw+v61ubsJKzeW8z1UrviXLzh4ezxldr0mNvzKqDLBLDwWcv1OrbkQp6/utnlidr4FbXxr+b6JLHlrs3Z+v3+S6nLdtT3DLPxw9riVsbupcfU/P7+quT6uNPdK6zbf9f3msHPi7vMUsbxC6/rWcnyKrHjz/D8odzzruDzXs31Q8T0itj09vz+X8TpB6rmJKTUSr7pAavqXsz1fNb3dLrUetX3/v//QKPIzeDnjNv4Ba3sMq/eJ7nvcqi8BK/uMrXl1/L8Xcnxtuj6TsXwCaHabcvuHaTWO63YdNP3/v7+9vr7o+D2Wbnc6ff8ZLbVVsjygtj3asHhftf4P8P0RsPxqtPifNDvBqTf/v7/D7TxU8Dogtj4JbfsYs32A6fkac3zS8TwitXx4fP6T8f1HKnd2fP9f9LwA6zrUsTuOb/wNqnT6Pj+ftP0hrXGWpy0Z6G3J7vyU67QdtHzPsLzkLvKZMDi5/X6E53RDZ/VRLbhSLfgLaXS3fH5FajeBa3qO5m8Xcz2fK7BcL7bbKi+Y6O5VcTtTbfdjsrh5/f+OsH0pcvZwef1yOv4f7nPR6LEV564RqjLTajJZsfr4fT8Q8HwSMX0cM7yX832PZzAY831q9DdVpu0RLvnQL7u3vT8F6DTCabhDKjiZs3zg77VQq/YZ8/2XMv1VcLqKbXpmt/4T7DUMafTOKjRp+P6////CyzttAAAAQB0Uk5T////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AFP3ByUAAAfXSURBVFjDtVgLXFPXGb83RIgJDhIeCTYEhBANBG9SiINaaKQSSh8UU5GqsQWEAvJYsGI6IjqRQcVHqwEr6izYWKTSunYZKlotLe1a27LaB31sXV+WsWf3dFu7kp7znXuTGx5dV+if3y/nO9/3ne9/znfOd7j3Up5p8LPxCIPNqfbMGqip1YeeWpzDCPNa6oXfMdOh70eX1IzfMF4z3nXku2W6z3qDnsWnn03lcNTZJjAYtOP7WmfGdPjGtmwWn1/ummIPexa6xc19fXKDqF5YNhOmoCGGYd6I0cS8wTDde8weT5nabj/fyKV29XZrUXYecmHysm2ivx+dAVOPu6ioaKOO0m08nZMTGxT49GK3w5HQtdSOc3X4k/CWohwv2q4+GfT/MDWq1b24WcEIDILT28P7+o4pKIpSHLPZFkRKQ1vaioraZFdFP73iKdsqtfXZeOiWHZ9EpVY3Tsl0KPC3G6Si/Z8HbjnrtlrF2oaEHTLZMQrjmEzmSrY1t8gQWpr7Ou/9YY/7Eej50CI/buRvotO2f0S6YT+zghRjL0uLmA4fmC8SBAeHjjkul7eUd2o7EbTaF4DpBa0fOmVzwsu1k2DtMtZEGATMFY9nX89Ig7jc9ohNFiqof/qKp/fXi0XSrqVHMVPj1gS5PFQsDpVrccNhFTCtEk9A8FXxZITOcVnF0dGi9iNPjUSXy5FXcLA4VFsuuPfO740mo1bU/hliOjBfHB0xGSyTTyGYHhGG6KtoTdHiIZE8+gkDhyei5VIXMiAhor2MevX6sR2XEZKTk0+mZ17UaDLD0k+iTgEwFSQDPtZkbij48GLUhpUs7smMKigIy7wHKd6O+hANSh+xWq3JYw0rrdaR9DCkuZiZftK6sqHBiNDcbAwfp/Les4oAZ6P2VlnQgSvcWbU3arvoFmC6BUxLailLTJZOUfkxcRV9VGqpzMraaSkNEy27UKlDg6reWsbZ3qraiTQKCwrTLpVKjVJjYKBRGk453nMDLsVUUl7sfPPSyyC8nIDwQSGSCvGpr12YAPgVrgAddvxnHTtEUfcRtixcUqrwhqmM+VN4uCnc1N1tSkilBvPnA27XUTwosi5BewlZPuBNYRn4LvIF+43PVnrQ4XBkFvLDFL75Z4cJ/TlMrgBKGeDCOAge7+rl8rx3saRbBK6LhobuJ0R6+H14CONZXyw8v35W3njjnPshjFpvEMlAqwibQ5CaQwni8zG+AN8BkIVIMl4Dimvyz9WC0J1vx82j+flJSUk3QTgSvj8YKbqhozj3IDgbjyNV0kAQli27sZwUqSyjnGkBGD+BYbkgBzQHBg3sBsXu/5J9aA4I2ApL2IzMuTDxI2BQ50Zi1EPnx19CcxZUkblA/ywWlfGBHqr6emUqAmGKeWV9KosfgCKdEMmQ4nGQzg0ODoJJvQ76qwcJyAL+gX8DF7DYgnu1SKhIMuE74tVNsUqlcjPJet3eP/5uzXrUV94BCpK6GqxQOmHaSIBtOkIcHlQSkKKAxZ5kVcr1kFJlfHyxndx7WypiEZzcqUPltGRNYuwdvCP0DnaIhWAWJDyKhXXEIZYFz71Ow+J1ziNeSJhqUtIQEp28A1WaOfxzHpNlDfZIM2P5obTl+LyZ0ohDCgu+ux/MyBjrJEzCtArAqJDHlfUjvnvprXEIq6Gi4sByOm4YLHEshqchytiPjMXsmoQpazk48uxcEtmStJM6uvmMSqWCvbxJ9TBulquuA0OHiuAhX3CHSjIBKSyTMY1GaOo4hRv6MbfeW5KIaNeZDCC+C9tw+nSn7sZTpWnC9CVN8IWP6RV6ItLOE6beRNQ5FXNh74usQe8b9R+aziVbFYIMd2JpDb6KDnBMfzgBQ07ARWIvgVV7Ga7VzAWzspX9796uomk8vi6EOKzyMV2HugzZqg6aXu49+Ns4JkXWSygfIVnQ+QRqTHctCdM0t5bS3Y4ElYh7jnDG0TRcc6WvdeBhECvDy0STvbu5iaaxshdPnuaYKMXzGs0zVXDlmrcR18rXXmqiT7wIl60OecY5OabqxyX0NpKjC3gYiIt9TIkkJFpxD7vUf/uYeHiOpjdBJVief0bzeh3stJ6mJZGt3qew+35J02P+o8aGfUy0HOSDbPoQzniZMnxD9Nh1j9kvjB15rq3hPe99inYqIIhXBS5y0Mzs1oJpmCbpo6gS2st0gOHGMMR1E+88mW14l9ytPKajiRKkC7AF4fAZ+jGYXUlGyR6WaZc+w+7GAsnpOh/TItpVgujtjNJ74pRyrKGCGBghiVT7PcP+Aqj+N8h2NvGZvh6SVNOE5/JvSPUX74Z8MyZJqnnSG4D6ydv8nVJ+XzyBPCQkZCOOvnk6pmLX6Fr/GP9qnOpdQ7iHx/XYaL/n/V1+w+ZWlcJzTwY9DVNxNqrNgdt4MezTvdWsCE3Fc6qoWKDFN5XnfX5KO7innlzS/yt50ODMFRVaMn8TM6rCR2407/zXvj9Vz5u3r9/bM/JSeoqtlDFOAf2/4Rx1Mkx2/7d8d/cts/4BLvIAuj/NJS4v9fEMUjCSyJl8JeChbB7TNqDyP1FK/llJGZ8lJtiwTX5Mxf1LvSulVVLPLDJ56vmLUsk8nufOcJ2E1lllqs715YvEJjUhUTK9nlll8lR76yRlBxt7HvpM4Oyd4TeWqUAW4V+Ns/CFakqoUa01fuvvRl8BomtLflJHVQEAAAAASUVORK5CYII=" alt="" /></a><br /><h1>Chat History with <a href='callto://jfgomez86' title=jfgomez86>Jose Felix Gomez (jfgomez86)</a></h1><p>Created on 2009-05-06 02:14:58.</p><dl><dd></dd><h3>2009-04-28</h3><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>10:25:18</span></dt><dd>Hello Robert</dd><dt class="local">Robert Pierce: <span>10:25:34</span></dt><dd>Hi Jose</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>10:26:05</span></dt><dd>I'm responsible for the erb to haml conversion, and I foresaw that it would &nbsp;not work without some more work. I can however revert those changes inmediately and keep only those that were working before it</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>10:27:15</span></dt><dd>So in order for you guys to actually be able to test what's being worked on here right now, I'd suggest reverting and keep working on the menu.</dd><dt class="local">Robert Pierce: <span>10:27:51</span></dt><dd>Ok. I fixed most of the haml this morning. I can push those changes and then there should just be a few left. Want to try that?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>10:28:25</span></dt><dd>That would be also cool. Sorry for that.</dd><dt class="local">Robert Pierce: <span>10:28:40</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>10:28:41</span></dt><dd>pushing now</dd><dt class="local">Robert Pierce: <span>10:29:37</span></dt><dd>ok done</dd><dt class="local">Robert Pierce: <span>10:30:11</span></dt><dd>np Jose, just getting time crunched here.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>10:34:38</span></dt><dd>ok</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>10:35:27</span></dt><dd>I'll get back to work, if there's anything else you need pease let me or Jonathan know.</dd><dt class="local">Robert Pierce: <span>10:36:48</span></dt><dd>thks Jose</dd><dt class="local">Robert Pierce: <span>10:37:26</span></dt><dd>Jose, please add skype contact "kizmeta" also. That's Matt Petty, the project technical lead.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>10:37:41</span></dt><dd>Ok</dd><dd></dd><h3>2009-05-05</h3><dt class="local">Robert Pierce: <span>15:01:38</span></dt><dd>Hey Jose, Matt would like to know...</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>15:01:51</span></dt><dd>?</dd><dt class="local">Robert Pierce: <span>15:02:07</span></dt><dd>1) what does relocated mean ("and for security reasons the private.pem and public.pem should be relocated")?</dd><dt class="local">Robert Pierce: <span>15:02:16</span></dt><dd>2) Where MY TESTS?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>15:03:15</span></dt><dd>ok, gimme a sec</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>15:08:04</span></dt><dd>1) I didn't mean that it's a *must*, but maybe you guys wouldn't like to have the keys (private.pem and public.pem) in you app's Root for any reason.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>15:09:10</span></dt><dd>2) I focused on making the code and send it, because you needed it really fast. Right now I'm writing the necessary tests.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>15:11:20</span></dt><dd>I'm also writing a refactored TDD version</dd><dt class="local">Robert Pierce: <span>15:12:18</span></dt><dd>ok great</dd><dt class="local">Robert Pierce: <span>22:48:04</span></dt><dd>Hey Jose, you around?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>22:59:06</span></dt><dd>yah</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>22:59:10</span></dt><dd>hi</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>22:59:14</span></dt><dd>how are you?</dd><dt class="local">Robert Pierce: <span>22:59:23</span></dt><dd>good you're up late.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>22:59:30</span></dt><dd>always :D</dd><dt class="local">Robert Pierce: <span>23:00:08</span></dt><dd>I've got a big problem. SR users that are still on IE6 are experiencing failure of menu &amp; header. Can't navigate anywhere.</dd><dt class="local">Robert Pierce: <span>23:00:18</span></dt><dd>Need to come up with a solution. Any ideas?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:00:52</span></dt><dd>Jonathan told me about this small Javascript that shows an "Upgrade your browser" message on top right corner</dd><dt class="local">Robert Pierce: <span>23:00:55</span></dt><dd>Works great in every other browswer platform as far as I can tell. Damn IE6</dd><dt class="local">Robert Pierce: <span>23:01:12</span></dt><dd>I'm gonna need something more than that.</dd><dt class="local">Robert Pierce: <span>23:01:40</span></dt><dd>doing research now</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:01:48</span></dt><dd>also, when you say "can't navigate" you mean the menu doesn't show?</dd><dt class="local">Robert Pierce: <span>23:01:48</span></dt><dd>just wondered if you had any thoughts</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:01:52</span></dt><dd>the dropdowns?</dd><dt class="local">Robert Pierce: <span>23:02:01</span></dt><dd>yes and header is munged</dd><dt class="local">Robert Pierce: <span>23:02:41</span></dt><dd>http://skitch.com/rpierce/bqe9x/pacific-advisors-status-room-microsoft-internet-explorer-6.0</dd><dt class="local">Robert Pierce: <span>23:03:14</span></dt><dd>It's like the page never fully loads. Just sits there trying to load</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:03:34</span></dt><dd>I see</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:04:32</span></dt><dd>I could install a VM tomorrow and try some possible workarounds</dd><dt class="local">Robert Pierce: <span>23:04:44</span></dt><dd>ok let's touch base in the morning</dd><dt class="local">Robert Pierce: <span>23:04:46</span></dt><dd>thks</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:04:49</span></dt><dd>k</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:05:03</span></dt><dd>btw, I just pushed the tests and refactored encriptable.rb</dd><dt class="local">Robert Pierce: <span>23:05:12</span></dt><dd>great, I saw that</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:05:13</span></dt><dd>I hope you like it :D</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:05:39</span></dt><dd>Just a bit of css is missing to make the view look as the mockup</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:05:48</span></dt><dd>shouldn't take more than 15 minutes</dd><dt class="local">Robert Pierce: <span>23:27:19</span></dt><dd>Do you know how to revert in git?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:27:50</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>23:28:07</span></dt><dd>I just want to take the pacificadvisors branch back to the previous commit to it.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:28:08</span></dt><dd>a git reset HEAD path/to/file</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:28:21</span></dt><dd>oh ok, do this:</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:28:35</span></dt><dd>git reset HEAD^</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:28:38</span></dt><dd>that should work</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:28:46</span></dt><dd>wait</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:29:03</span></dt><dd>you need to be in pacificadvisors branch first</dd><dt class="local">Robert Pierce: <span>23:29:13</span></dt><dd>so "git co pacificadvisors"</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:29:14</span></dt><dd>(git checkout pacificadvisors)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:29:18</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>23:29:31</span></dt><dd>git reset HEAD^</dd><dt class="local">Robert Pierce: <span>23:29:38</span></dt><dd>so that takes me one back?</dd><dt class="local">Robert Pierce: <span>23:29:49</span></dt><dd>if I need to do one more, then the same command?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:29:51</span></dt><dd>it should</dd><dt class="local">Robert Pierce: <span>23:29:53</span></dt><dd>again?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:29:54</span></dt><dd>wait</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:30:07</span></dt><dd>there are better alternatives for going back and forth. do this:</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:30:11</span></dt><dd>git reflog</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:30:17</span></dt><dd>and you'll see a commit list</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:30:57</span></dt><dd>pick one and then git checkout HEAD@{#} where # is the commit number you want</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:31:11</span></dt><dd>then you can go forth again</dd><dt class="local">Robert Pierce: <span>23:31:38</span></dt><dd>hmm I really just want the one previous and I can't exactly make it out from the list.</dd><dt class="local">Robert Pierce: <span>23:32:03</span></dt><dd>is the 'git reset HEAD^' still a good way to go?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:32:08</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>23:32:13</span></dt><dd>ok.</dd><dt class="local">Robert Pierce: <span>23:32:20</span></dt><dd>thanks. I'll give it a whirl. :)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:32:25</span></dt><dd>yeah, if it complains just put a --hard after reset</dd><dt class="local">Robert Pierce: <span>23:32:48</span></dt><dd>then git push to make that change to the origin/pacificadvisors on github?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:32:53</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>23:33:01</span></dt><dd>k, here goes. :)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:33:05</span></dt><dd>good luck</dd><dt class="local">Robert Pierce: <span>23:33:37</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; git reset HEAD^<BR>
app/stylesheets/_roomy.sass: needs update<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt;</dd><dt class="local">Robert Pierce: <span>23:33:45</span></dt><dd>hmm does that mean it did it? or not? grrr</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:33:51</span></dt><dd>nop</dd><dt class="local">Robert Pierce: <span>23:34:08</span></dt><dd>git stash first?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:34:11</span></dt><dd>do this:</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:34:53</span></dt><dd>git reset &nbsp;HEAD app/stylesheets/_roomy.sass</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:35:40</span></dt><dd>actually....sorry :P a git reset --hard HEAD^ should work</dd><dt class="local">Robert Pierce: <span>23:35:41</span></dt><dd>hmm. same thing. ~/www/railsmachine/statusroom(pacificadvisors) &gt; git reset HEAD app/stylesheets/_roomy.sass<BR>
app/stylesheets/_roomy.sass: needs update<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt;</dd><dt class="local">Robert Pierce: <span>23:35:48</span></dt><dd>ok</dd><dt class="local">Robert Pierce: <span>23:36:40</span></dt><dd>as long as I'm in the pacificadvisors branch that'll only affect this branch right? (little nervou about the whole reset --hard thing.)</dd><dt class="local">Robert Pierce: <span>23:36:41</span></dt><dd>:)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:36:52</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>23:36:56</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>23:37:31</span></dt><dd>hmm looks good so far. Let's see how deploy goes</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:37:36</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>23:38:11</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; git push &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<BR>
error: remote 'refs/heads/koombea' is not a strict subset of local ref 'refs/heads/koombea'. maybe you are not up-to-date and need to pull first?<BR>
error: remote 'refs/heads/pacificadvisors' is not a strict subset of local ref 'refs/heads/pacificadvisors'. maybe you are not up-to-date and need to pull first?<BR>
error: remote 'refs/heads/peachtreeplanning' is not a strict subset of local ref 'refs/heads/peachtreeplanning'. maybe you are not up-to-date and need to pull first?<BR>
error: failed to push to '[email protected]:c3mediagroup/statusroom.git'<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt;</dd><dt class="local">Robert Pierce: <span>23:38:22</span></dt><dd>why is it complaining about other branches?</dd><dt class="local">Robert Pierce: <span>23:38:45</span></dt><dd>can I tell it to 'just do it' ?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:39:06</span></dt><dd>when it does a push, it pushes all local branches to remote branches (local master to remote master and so on)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:39:15</span></dt><dd>you could do this: git push pacificadvisors</dd><dt class="local">Robert Pierce: <span>23:39:27</span></dt><dd>ok</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:39:29</span></dt><dd>or if it complains: git push origin/pacificadvisors</dd><dt class="local">Robert Pierce: <span>23:40:03</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; git push pacificadvisors<BR>
fatal: 'pacificadvisors': unable to chdir or not a git archive<BR>
fatal: The remote end hung up unexpectedly<BR>
error: failed to push to 'pacificadvisors'<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt; git push origin/pacificadvisors<BR>
fatal: 'origin/pacificadvisors': unable to chdir or not a git archive<BR>
fatal: The remote end hung up unexpectedly<BR>
error: failed to push to 'origin/pacificadvisors'<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt;</dd><dt class="local">Robert Pierce: <span>23:40:20</span></dt><dd>git push . origin/pacificadvisors ?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:40:40</span></dt><dd>without the dot should work...let me see</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:40:43</span></dt><dd>pwd?</dd><dt class="local">Robert Pierce: <span>23:41:00</span></dt><dd>for...</dd><dt class="local">Robert Pierce: <span>23:41:01</span></dt><dd>?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:41:14</span></dt><dd>you inside the local repo right?</dd><dt class="local">Robert Pierce: <span>23:41:18</span></dt><dd>yes</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:41:21</span></dt><dd>hmm...</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:41:29</span></dt><dd>oh...</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:41:37</span></dt><dd>:D my mistake again.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:41:45</span></dt><dd>it should read git push origin pacificadvisors</dd><dt class="local">Robert Pierce: <span>23:41:55</span></dt><dd>i've got this in .git/config:</dd><dt class="local">Robert Pierce: <span>23:41:56</span></dt><dd>[branch "pacificadvisors"]<BR>
remote = origin<BR>
merge = refs/heads/pacificadvisors</dd><dt class="local">Robert Pierce: <span>23:42:07</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>23:42:35</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; git push origin pacificadvisors<BR>
error: remote 'refs/heads/pacificadvisors' is not a strict subset of local ref 'refs/heads/pacificadvisors'. maybe you are not up-to-date and need to pull first?<BR>
error: failed to push to '[email protected]:c3mediagroup/statusroom.git'<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt;</dd><dt class="local">Robert Pierce: <span>23:42:42</span></dt><dd>but I don't want to pull first! :)</dd><dt class="local">Robert Pierce: <span>23:42:59</span></dt><dd>(that's part of the point of this exercise)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:43:09</span></dt><dd>yeah...i see</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:43:40</span></dt><dd>reads</dd><dt class="local">Robert Pierce: <span>23:44:14</span></dt><dd>what was that? never seen that before on skype.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:44:31</span></dt><dd>it's like on irc, type /me msg</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:44:41</span></dt><dd>random thoughts</dd><dt class="local">Robert Pierce: <span>23:44:45</span></dt><dd>http://skitch.com/rpierce/bqjnn/jose-felix-gomez</dd><dt class="local">Robert Pierce: <span>23:44:51</span></dt><dd>oh ok. :)</dd><dt class="local">Robert Pierce: <span>23:45:10</span></dt><dd>test message</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:45:16</span></dt><dd>works</dd><dt class="local">Robert Pierce: <span>23:45:16</span></dt><dd>heh</dd><dt class="local">Robert Pierce: <span>23:45:52</span></dt><dd>ok, so I want github to just take this local branch of pacificadvisors and just use it</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:46:01</span></dt><dd>well, if you want to override your remote changes, you could also do a revert, although there must be a way to do what you want</dd><dt class="local">Robert Pierce: <span>23:48:00</span></dt><dd>So I want to reset origin to c0bf90a</dd><dt class="local">Robert Pierce: <span>23:48:14</span></dt><dd>(on the pacificadvisors branch)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:48:22</span></dt><dd>if that's the sha hash you want, yup</dd><dt class="local">Robert Pierce: <span>23:50:04</span></dt><dd>git revert origin $c0bf90a</dd><dt class="local">Robert Pierce: <span>23:50:05</span></dt><dd>?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:50:25</span></dt><dd>wait</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:50:28</span></dt><dd>just got some info:</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:50:42</span></dt><dd>git push -f origin pacificadvisors</dd><dt class="local">Robert Pierce: <span>23:50:56</span></dt><dd>f as in "force" ?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:51:00</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>23:51:27</span></dt><dd>success!</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:51:33</span></dt><dd>kk :)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:51:44</span></dt><dd>(it didn't blew up anything right?)</dd><dt class="local">Robert Pierce: <span>23:52:07</span></dt><dd>deploying now (fingers crossed)...</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:55:06</span></dt><dd>tell me if it succeeds!</dd><dt class="local">Robert Pierce: <span>23:55:50</span></dt><dd>I think I missed the commit by one (didn't go back far enough). Trying again.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>23:56:00</span></dt><dd>k</dd><dd></dd><h3>2009-05-06</h3><dt class="local">Robert Pierce: <span>00:00:13</span></dt><dd>hmm having traverse back down the whole line of commits. I was thinking it'd know that the previous commit was the earlier version.</dd><dt class="local">Robert Pierce: <span>00:00:19</span></dt><dd>not a problem I guess</dd><dt class="local">Robert Pierce: <span>00:00:53</span></dt><dd>any way to go the other direction if I go too far?</dd><dt class="local">Robert Pierce: <span>00:00:54</span></dt><dd>:)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:01:00</span></dt><dd>yup</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:01:07</span></dt><dd>git reflog</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:01:16</span></dt><dd>then git reset --hard HEAD@{#}</dd><dt class="local">Robert Pierce: <span>00:01:34</span></dt><dd>k thks</dd><dt class="local">Robert Pierce: <span>00:02:00</span></dt><dd>I owe you big time for saving my butt tonight.</dd><dt class="local">Robert Pierce: <span>00:02:03</span></dt><dd>thks</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:02:09</span></dt><dd>:D</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:02:14</span></dt><dd>did it work?</dd><dt class="local">Robert Pierce: <span>00:03:12</span></dt><dd>not yet. looking for the right commit</dd><dt class="local">Robert Pierce: <span>00:06:31</span></dt><dd>I guess a good tagging practice would be very helpful right about now. :)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:06:44</span></dt><dd>lol</dd><dt class="local">Robert Pierce: <span>00:09:15</span></dt><dd>hmm the deploy doesn't seem to be picking up the old version</dd><dt class="local">Robert Pierce: <span>00:09:49</span></dt><dd>&nbsp;origin/pacificadvisors &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;385dfe6 Cleaning up my uncommitted files and git repository</dd><dt class="local">Robert Pierce: <span>00:09:59</span></dt><dd>* pacificadvisors &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;385dfe6 Cleaning up my uncommitted files and git repository</dd><dt class="local">Robert Pierce: <span>00:10:05</span></dt><dd>that looks right</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:10:38</span></dt><dd>what shows git status?</dd><dt class="local">Robert Pierce: <span>00:10:56</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; git st<BR>
# On branch pacificadvisors<BR>
nothing to commit (working directory clean)<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt;</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:11:20</span></dt><dd>git reflog? (first 8 lines)</dd><dt class="local">Robert Pierce: <span>00:11:43</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; git reflog &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<BR>
385dfe6... HEAD@{0}: reset --hard HEAD@{225}<BR>
d77cfb8... HEAD@{1}: reset --hard HEAD^<BR>
afa2fcb... HEAD@{2}: reset --hard HEAD^<BR>
60742f7... HEAD@{3}: reset --hard HEAD^<BR>
0372e24... HEAD@{4}: reset --hard HEAD^<BR>
219a3ab... HEAD@{5}: reset --hard HEAD^<BR>
d028f07... HEAD@{6}: reset --hard HEAD^<BR>
3ed5d84... HEAD@{7}: reset --hard HEAD^</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:11:50</span></dt><dd>ouch</dd><dt class="local">Robert Pierce: <span>00:12:26</span></dt><dd>I hope this isn't going to hurt too much.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:12:37</span></dt><dd>git reset --hard HEAD^ will take you to 1 and make it 0 so next git reset --hard HEAD^ takes you to the previous one</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:12:50</span></dt><dd>nah it won't hurt anything else than the reflog</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:13:07</span></dt><dd>can you paste the entire reflog on http://pastie.org please?</dd><dt class="local">Robert Pierce: <span>00:14:48</span></dt><dd>http://gist.github.com/107413</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:15:31</span></dt><dd>so HEAD@{255} went too far?</dd><dt class="local">Robert Pierce: <span>00:16:11</span></dt><dd>I did: git reset --hard HEAD@{225} which should be correct.</dd><dt class="local">Robert Pierce: <span>00:16:31</span></dt><dd>But pacificadvisors.statusroom.com is running the same code</dd><dt class="local">Robert Pierce: <span>00:16:47</span></dt><dd>after "cap pacificadvisors deploy"</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:16:59</span></dt><dd>the local code is correct right?</dd><dt class="local">Robert Pierce: <span>00:17:10</span></dt><dd>let me double check</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:17:15</span></dt><dd>what did the last push show?</dd><dt class="local">Robert Pierce: <span>00:18:03</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; git reset --hard HEAD@{225}<BR>
Checking 170 files out...<BR>
&nbsp;100% (170/170) done<BR>
HEAD is now at 385dfe6... Cleaning up my uncommitted files and git repository<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt; git push -f origin pacificadvisors<BR>
updating 'refs/heads/pacificadvisors'<BR>
&nbsp;&nbsp;from 4e80e68ed2371d0f5843c44a726e8afe46c7b85c<BR>
&nbsp;&nbsp;to &nbsp;&nbsp;385dfe6f651265b9a15a478e2adbdedadf36e1ca<BR>
&nbsp;Also local refs/remotes/origin/pacificadvisors<BR>
Generating pack...<BR>
Done counting 0 objects.<BR>
Writing 0 objects...<BR>
Total 0 (delta 0), reused 0 (delta 0)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:18:44</span></dt><dd>it did updated the head</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:18:58</span></dt><dd>maybe the remote repo is working on a diff branch?</dd><dt class="local">Robert Pierce: <span>00:21:46</span></dt><dd>k checking now</dd><dt class="local">Robert Pierce: <span>00:24:05</span></dt><dd>ok I confirmed that it's the correct commit by running script/server locally.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:24:18</span></dt><dd>ok</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:24:30</span></dt><dd>did you do another push?</dd><dt class="local">Robert Pierce: <span>00:24:33</span></dt><dd>so must be a capistrano / deploy issue.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:24:50</span></dt><dd>I going to check the recipe</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:25:52</span></dt><dd>isn't actually the greatest expert in capistrano, that's Jonathan's role...</dd><dt class="local">Robert Pierce: <span>00:25:59</span></dt><dd>:)</dd><dt class="local">Robert Pierce: <span>00:27:22</span></dt><dd>http://skitch.com/rpierce/bqjr1/default</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:27:39</span></dt><dd>ok, maybe this has something to do: set :branch, "production"<BR>
(found in config/deploy/pacificadvisors.rb)</dd><dt class="local">Robert Pierce: <span>00:27:51</span></dt><dd>yep, that'd do it.</dd><dt class="local">Robert Pierce: <span>00:28:21</span></dt><dd>ok so the question is... how do I get that change in the code and then pushed? Just like normal now. Or something tricky?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:29:08</span></dt><dd>hmm...i think you'd have to switch to production branch then change the code and then re push it (still on production branch)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:29:22</span></dt><dd>IF remote server is actually on production branch</dd><dt class="local">Robert Pierce: <span>00:29:38</span></dt><dd>lost</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:30:15</span></dt><dd>well, the problem here is that you need to set :branch "pacificadvisors" in config/deploy/pacificadvisors.rb right?</dd><dt class="local">Robert Pierce: <span>00:30:15</span></dt><dd>oh wait,I can just make the change locally and run the cap task. It just reads the local for executing its tasks, right?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:30:27</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>00:30:33</span></dt><dd>k let me try</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:30:36</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>00:31:53</span></dt><dd>Boy, we went to all that trouble to isolate and sandbox the pacificadvisors instance, then screwed up the pointer in the deploy file. doh!</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:32:15</span></dt><dd>heh...</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:32:21</span></dt><dd>will that work?</dd><dt class="local">Robert Pierce: <span>00:32:29</span></dt><dd>deploying now</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:32:38</span></dt><dd>crosses fingers</dd><dt class="local">Robert Pierce: <span>00:32:51</span></dt><dd>I love that. I'm going to use it tomorrow</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:33:00</span></dt><dd>lol</dd><dt class="local">Robert Pierce: <span>00:33:09</span></dt><dd>Robert likes it!</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:33:20</span></dt><dd>i can see that.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:33:26</span></dt><dd>/nudge</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:33:38</span></dt><dd>didn't work</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:34:22</span></dt><dd>type this: /help and have fun</dd><dt class="local">Robert Pierce: <span>00:34:51</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>00:34:55</span></dt><dd>:( failure</dd><dt class="local">Robert Pierce: <span>00:34:57</span></dt><dd>&nbsp;** [vm01.statusroom.c3media.managedmachine.com :: out] No submodule mapping found in .gitmodules for path 'vendor/plugins/navigation_helper'<BR>
&nbsp;&nbsp;&nbsp;&nbsp;command finished<BR>
*** [deploy:update_code] rolling back<BR>
&nbsp;&nbsp;* executing "rm -rf /srv/statusroom/releases/20090506073245; true"<BR>
&nbsp;&nbsp;&nbsp;&nbsp;servers: ["vm01.statusroom.c3media.managedmachine.com"]<BR>
&nbsp;&nbsp;&nbsp;&nbsp;[vm01.statusroom.c3media.managedmachine.com] executing command<BR>
&nbsp;&nbsp;&nbsp;&nbsp;command finished</dd><dt class="local">Robert Pierce: <span>00:35:10</span></dt><dd>So I must have the wrong commit, but at least I'm close now</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:35:29</span></dt><dd>that's a really weird message</dd><dt class="local">Robert Pierce: <span>00:37:12</span></dt><dd>so is there a way on git hub to see the history of commits to just the pacificadvisors branch?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:37:31</span></dt><dd>yeah</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:37:37</span></dt><dd>"commits" tab on top</dd><dt class="local">Robert Pierce: <span>00:38:18</span></dt><dd>ha I did pick the right one.</dd><dt class="local">Robert Pierce: <span>00:38:25</span></dt><dd>https://github.com/c3mediagroup/statusroom/commits/pacificadvisors</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:39:26</span></dt><dd>I see it's there</dd><dt class="local">Robert Pierce: <span>00:40:44</span></dt><dd>hmm. don't know what to do now</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:41:04</span></dt><dd>the problem is not git anymore?</dd><dt class="local">Robert Pierce: <span>00:41:12</span></dt><dd>don't think so</dd><dt class="local">Robert Pierce: <span>00:43:29</span></dt><dd>k how about this, I know we've got a good history of repos on the pacificadvisors servers. can I explicity tell cap to deploy one of those I wonder?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:43:56</span></dt><dd>i don't think so</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:44:09</span></dt><dd>set :keep_releases, 4</dd><dt class="local">Robert Pierce: <span>00:44:21</span></dt><dd>hmm</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:44:23</span></dt><dd>i think that line makes it keep only the 4 last repos</dd><dt class="local">Robert Pierce: <span>00:45:33</span></dt><dd>whew, ok so the challenge is to get the pacificadvisors.statusroom.com instance back to the state it was 48hrs ago or so.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:45:47</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>00:46:03</span></dt><dd>the git branch is correct on local and remote...</dd><dt class="local">Robert Pierce: <span>00:46:15</span></dt><dd>k, let me try the cap task again.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:46:18</span></dt><dd>remote means github right?</dd><dt class="local">Robert Pierce: <span>00:46:42</span></dt><dd>yes</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:46:51</span></dt><dd>k</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:47:04</span></dt><dd>(are you into cool geeky scripts?)</dd><dt class="local">Robert Pierce: <span>00:47:20</span></dt><dd>when I have time (which isn't much lately)</dd><dt class="local">Robert Pierce: <span>00:48:47</span></dt><dd>cap -T there's some different Railsmachine / Moonshine tasks I've never seen before</dd><dt class="local">Robert Pierce: <span>00:49:04</span></dt><dd>trying "cap pacificadvisors deploy:update"</dd><dt class="local">Robert Pierce: <span>00:49:33</span></dt><dd>same weird .gitmodule error</dd><dt class="local">Robert Pierce: <span>00:50:06</span></dt><dd>let me try going to one commit farther back</dd><dt class="local">Robert Pierce: <span>00:50:59</span></dt><dd>This commit message makes me suspicious of a correlation "Cleaning up my uncommitted files and git repository"</dd><dt class="local">Robert Pierce: <span>00:51:08</span></dt><dd>to the .git error on deploy</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:51:35</span></dt><dd>maybe, but i'm reading something else</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:52:25</span></dt><dd>cat .git/config | pastie.rb</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:52:42</span></dt><dd>ehm...paste it as a gist</dd><dt class="local">Robert Pierce: <span>00:53:39</span></dt><dd>http://gist.github.com/107426</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:56:03</span></dt><dd>what happens if you run this: git rm —cached vendor/plugins/navigation_helper &nbsp;(preferably in a stash or some other tmp branch)</dd><dt class="local">Robert Pierce: <span>00:57:04</span></dt><dd>~/www/railsmachine/statusroom(temp) &gt; git rm --cached vendor/plugins/navigation_helper<BR>
fatal: not removing 'vendor/plugins/navigation_helper' recursively without -r</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:57:21</span></dt><dd>nah, don't run it then</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:57:24</span></dt><dd>let me read some more</dd><dt class="local">Robert Pierce: <span>00:57:37</span></dt><dd>sorry Jose. I really appreciate the help though</dd><dt class="local">Robert Pierce: <span>00:57:47</span></dt><dd>I've got to get this solved somehoww</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>00:59:47</span></dt><dd>did you try deploying a different HEAD?</dd><dt class="local">Robert Pierce: <span>00:59:58</span></dt><dd>doing that right now</dd><dt class="local">Robert Pierce: <span>01:04:59</span></dt><dd>dang. same error</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:05:42</span></dt><dd>is there any .git directory inside vendor/plugins/navigation_helper?</dd><dt class="local">Robert Pierce: <span>01:06:27</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; cd vendor/plugins/navigation_helper<BR>
~/www/railsmachine/statusroom/vendor/plugins/navigation_helper(pacificadvisors) &gt; ls -al<BR>
total 72<BR>
drwxr-xr-x &nbsp;12 rpierce &nbsp;rpierce &nbsp;&nbsp;408 May &nbsp;4 23:43 .<BR>
drwxr-xr-x &nbsp;34 rpierce &nbsp;rpierce &nbsp;1156 May &nbsp;4 23:43 ..<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;18 May &nbsp;4 23:43 .gitignore<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;1068 May &nbsp;4 23:43 MIT-LICENSE<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;9725 May &nbsp;4 23:43 README.textile<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;570 May &nbsp;4 23:43 Rakefile<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;209 May &nbsp;4 23:43 init.rb<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;746 May &nbsp;4 23:43 install.rb<BR>
drwxr-xr-x &nbsp;&nbsp;4 rpierce &nbsp;rpierce &nbsp;&nbsp;136 May &nbsp;4 23:43 lib<BR>
drwxr-xr-x &nbsp;&nbsp;6 rpierce &nbsp;rpierce &nbsp;&nbsp;204 May &nbsp;4 23:43 spec<BR>
drwxr-xr-x &nbsp;&nbsp;3 rpierce &nbsp;rpierce &nbsp;&nbsp;102 May &nbsp;4 23:43 tasks<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;27 May &nbsp;4 23:43 uninstall.rb<BR>
~/www/railsmachine/statusroom/vendor/plugins/navigation_helper(pacificadvisors) &gt;</dd><dt class="local">Robert Pierce: <span>01:06:52</span></dt><dd>~/www/railsmachine/statusroom/vendor/plugins/navigation_helper(pacificadvisors) &gt; more .gitignore<BR>
coverage<BR>
.DS_Store<BR>
~/www/railsmachine/statusroom/vendor/plugins/navigation_helper(pacificadvisors) &gt;</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:07:33</span></dt><dd>is there any .gitsubmodules in RAILS_ROOT?</dd><dt class="local">Robert Pierce: <span>01:08:05</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; ls -al<BR>
total 184<BR>
drwxr-xr-x &nbsp;26 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;884 May &nbsp;6 00:25 .<BR>
drwxr-xr-x &nbsp;19 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;646 May &nbsp;2 11:33 ..<BR>
-rw-r--r--@ &nbsp;1 rpierce &nbsp;rpierce &nbsp;12292 Feb &nbsp;9 11:07 .DS_Store<BR>
drwxr-xr-x &nbsp;17 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;578 May &nbsp;6 01:02 .git<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;276 May &nbsp;5 22:53 .gitignore<BR>
-rw-r--r--@ &nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;151 Aug 11 &nbsp;2008 Capfile<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;1245 May &nbsp;4 23:43 README.rdoc<BR>
-rw-r--r--@ &nbsp;1 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;307 Aug 11 &nbsp;2008 Rakefile<BR>
drwxr-xr-x &nbsp;15 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;510 May &nbsp;1 23:03 _Source<BR>
drwxr-xr-x &nbsp;&nbsp;9 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;306 May &nbsp;4 23:43 app<BR>
drwxr-xr-x &nbsp;22 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;748 May &nbsp;6 01:02 config<BR>
drwxr-xr-x &nbsp;11 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;374 May &nbsp;6 00:05 db<BR>
drwxr-xr-x &nbsp;18 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;612 May &nbsp;4 23:33 doc<BR>
drwxr-xr-x &nbsp;10 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;340 May &nbsp;6 00:05 features<BR>
drwxr-xr-x &nbsp;&nbsp;4 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;136 Oct 14 &nbsp;2008 flexigrid<BR>
drwxr-xr-x &nbsp;13 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;442 May &nbsp;6 00:05 lib<BR>
drwxr-xr-x &nbsp;&nbsp;6 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;204 Mar 19 09:22 log<BR>
drwxr-xr-x &nbsp;&nbsp;5 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;170 Nov 20 09:31 ofoot<BR>
drwxr-xr-x &nbsp;18 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;612 May &nbsp;5 22:53 public<BR>
drwxr-xr-x &nbsp;&nbsp;3 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;102 Sep 22 &nbsp;2008 reports<BR>
-rw-r--r-- &nbsp;&nbsp;1 rpierce &nbsp;rpierce &nbsp;57830 May &nbsp;1 23:03 screen_test.css<BR>
drwxr-xr-x &nbsp;17 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;578 May &nbsp;1 23:03 script<BR>
drwxr-xr-x &nbsp;&nbsp;4 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;136 Aug 11 &nbsp;2008 stories<BR>
drwxr-xr-x &nbsp;11 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;374 May &nbsp;6 00:05 test<BR>
drwxr-xr-x &nbsp;70 rpierce &nbsp;rpierce &nbsp;&nbsp;2380 May &nbsp;6 00:05 tmp<BR>
drwxr-xr-x &nbsp;&nbsp;6 rpierce &nbsp;rpierce &nbsp;&nbsp;&nbsp;204 May &nbsp;4 23:43 vendor<BR>
~/www/railsmachine/statusroom(pacificadvisors) &gt;</dd><dt class="local">Robert Pierce: <span>01:08:10</span></dt><dd>doesn't look like it</dd><dt class="local">Robert Pierce: <span>01:10:14</span></dt><dd>let me try and see if I can even get it back to sync w/ production.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:10:21</span></dt><dd>k</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:11:53</span></dt><dd>try that set :git_enable_submodules, 0 ?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:12:02</span></dt><dd>inside pacificadvisors.rb</dd><dt class="local">Robert Pierce: <span>01:13:29</span></dt><dd>crap same error.</dd><dt class="local">Robert Pierce: <span>01:13:37</span></dt><dd>k gonna try your set :git</dd><dt class="local">Robert Pierce: <span>01:13:48</span></dt><dd>"set :git_enable_submodules, 0 ?"</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:13:58</span></dt><dd>yup</dd><dt class="local">Robert Pierce: <span>01:14:44</span></dt><dd>./config/deploy/pacificadvisors.rb:9: syntax error, unexpected tSYMBEG, expecting kDO or '{' or '('</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:15:05</span></dt><dd>oh without the question mark</dd><dt class="local">Robert Pierce: <span>01:15:18</span></dt><dd>http://skitch.com/rpierce/bqj8j/pacificadvisors.rb-statusroomproject-optimized</dd><dt class="local">Robert Pierce: <span>01:15:19</span></dt><dd>ah ok</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:15:28</span></dt><dd>it should read:<BR>
set :git_enable_submodules, 0</dd><dt class="local">Robert Pierce: <span>01:16:50</span></dt><dd>same: ** [vm01.statusroom.c3media.managedmachine.com :: out] No submodule mapping found in .gitmodules for path 'vendor/plugins/navigation_helper'</dd><dt class="local">Robert Pierce: <span>01:17:06</span></dt><dd>command "git clone -q --depth 1 [email protected]:c3mediagroup/statusroom.git /srv/statusroom/releases/20090506081546 &amp;&amp; cd /srv/statusroom/releases/20090506081546 &amp;&amp; git checkout -q -b deploy 5fccb1b6604396200c8a4fcf5466e948e980f141 &amp;&amp; git submodule -q init &amp;&amp; git submodule -q update &amp;&amp; (echo 5fccb1b6604396200c8a4fcf5466e948e980f141 &gt; /srv/statusroom/releases/20090506081546/REVISION)" failed on vm01.statusroom.c3media.managedmachine.com</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:19:03</span></dt><dd>that's really weird, if i understand well, it's cloning a remote copy (which is good) then it creates a deploy branch then initializes a submodule?? why does it do that...let me investigate</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:20:44</span></dt><dd>where did you set :git?</dd><dt class="local">Robert Pierce: <span>01:21:25</span></dt><dd>config/moonshine.yml?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:21:52</span></dt><dd>no, i mean set :git_enable_submodules</dd><dt class="local">Robert Pierce: <span>01:22:43</span></dt><dd>:git_enable_submodules</dd><dt class="local">Robert Pierce: <span>01:22:57</span></dt><dd>just a sec</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:23:00</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>01:23:30</span></dt><dd>config/deploy/build.rb</dd><dt class="local">Robert Pierce: <span>01:23:39</span></dt><dd>config/deploy/pacificadvisors.rb</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:23:42</span></dt><dd>try this:</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:23:50</span></dt><dd>git clean</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:23:55</span></dt><dd>then re-deploy</dd><dt class="local">Robert Pierce: <span>01:25:31</span></dt><dd>same error</dd><dt class="local">Robert Pierce: <span>01:25:37</span></dt><dd>:(</dd><dt class="local">Robert Pierce: <span>01:26:09</span></dt><dd>let me try to deploy something to staging and make sure this isn't systemic</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:26:15</span></dt><dd>ok</dd><dt class="local">Robert Pierce: <span>01:28:27</span></dt><dd>cap staging deploy works fine</dd><dt class="local">Robert Pierce: <span>01:28:48</span></dt><dd>something the pacificadvisors instance/moonshine setup?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:29:04</span></dt><dd>did it work yesterday</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:29:05</span></dt><dd>?</dd><dt class="local">Robert Pierce: <span>01:29:27</span></dt><dd>yes, pacificadvisors.statusroom.com has the latest code</dd><dt class="local">Robert Pierce: <span>01:31:13</span></dt><dd>how about I try: git co pacificadvisors, git merge staging, git push origin pacificadvisors, cap pacificadvisors deploy</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:32:09</span></dt><dd>it may work</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:32:29</span></dt><dd>you can try and if it doesn't, go back</dd><dt class="local">Robert Pierce: <span>01:33:50</span></dt><dd>nope same error</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:34:27</span></dt><dd>let me try something here</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:35:08</span></dt><dd>try doing this (to see if it works) cd .. &amp;&amp; git clone statusroom sr-tmp</dd><dt class="local">Robert Pierce: <span>01:36:19</span></dt><dd>whoops. hit Cmd-Q instead of Cmd-Tab</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:36:35</span></dt><dd>lol</dd><dt class="local">Robert Pierce: <span>01:37:01</span></dt><dd>it's thinking about it...</dd><dt class="local">Robert Pierce: <span>01:38:11</span></dt><dd>http://www.youtube.com/watch?v=yR0lWICH3rY</dd><dt class="local">Robert Pierce: <span>01:38:39</span></dt><dd>:)</dd><dt class="local">Robert Pierce: <span>01:38:55</span></dt><dd>45% done</dd><dt class="local">Robert Pierce: <span>01:39:10</span></dt><dd>ok done</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:39:27</span></dt><dd>rofl!</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:39:39</span></dt><dd>sinking!! (i fell too :D)</dd><dt class="local">Robert Pierce: <span>01:39:48</span></dt><dd>:)</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:39:58</span></dt><dd>ok, if that passes then it's definetly something capistrano's</dd><dt class="local">Robert Pierce: <span>01:40:16</span></dt><dd>ok do you want me to cd into sr-tmp</dd><dt class="local">Robert Pierce: <span>01:40:17</span></dt><dd>?</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:40:44</span></dt><dd>nope just rm -rf sr-tmp</dd><dt class="local">Robert Pierce: <span>01:40:47</span></dt><dd>~/www/railsmachine/statusroom(pacificadvisors) &gt; cd .. &amp;&amp; git clone statusroom sr-tmp<BR>
Initialized empty Git repository in /Users/rpierce/www/railsmachine/sr-tmp/.git/<BR>
Checking 5397 files out...<BR>
&nbsp;100% (5397/5397) done<BR>
~/www/railsmachine &gt;</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:41:03</span></dt><dd>it was just a test to see if clone failed</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:41:16</span></dt><dd>for some reason capistrano is calling a git submodules init</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:41:26</span></dt><dd>without there being actually any submodules on the project</dd><dt class="local">Robert Pierce: <span>01:41:28</span></dt><dd>fatal: bad config file line 2 in .gitmodules<BR>
No submodule mapping found in .gitmodules for path 'vendor/plugins/attachment_fu'<BR>
<BR>
I don't know why it's doing that, maybe it's something I'm doing wrong but you'll need to tidy it up to make it look more like the first example in order for it to work properly.<BR>
<BR>
One final thing to be aware of is that when you clone onto a new machine you'll need to run the following commands:<BR>
<BR>
git submodule init<BR>
git submodule update<BR>
<BR>
This will initialise the submodules that are referenced in the .gitmodules file, then pull them down. By default cloning doesn't seem to do that.</dd><dt class="local">Robert Pierce: <span>01:41:37</span></dt><dd>From: http://edspencer.net/2008/04/git-clone-vs-git-submodule.html</dd><dt class="local">Robert Pierce: <span>01:41:44</span></dt><dd>Just thought that might spur some thinking</dd><dt class="local">Robert Pierce: <span>01:45:18</span></dt><dd>hmm something just tickled my memory... could it be this? "set :git_shallow_clone, 0"</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:45:37</span></dt><dd>set it to 1 and let's hope it is</dd><dt class="local">Robert Pierce: <span>01:47:18</span></dt><dd>nope same error</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:47:55</span></dt><dd>try putting the last set options in deploy.rb rather than in pacificadvisors.rb</dd><dt class="local">Robert Pierce: <span>01:49:21</span></dt><dd>k</dd><dt class="local">Robert Pierce: <span>01:55:22</span></dt><dd>still trying things</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:55:37</span></dt><dd>k</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:57:50</span></dt><dd>robert i'm afraid i'm out of ideas and i have to go. Need to &nbsp;get up early tomorrow (today actually). I'll ask jonathan to help you if you still haven't solved the issue. I'm really sorry i couldn't help.</dd><dt class="local">Robert Pierce: <span>01:58:16</span></dt><dd>no, you did great. thanks so much. I'll keep messing with it.</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:58:25</span></dt><dd>kk. see you later</dd><dt class="local">Robert Pierce: <span>01:58:26</span></dt><dd>thank you again</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:58:27</span></dt><dd>bb</dd><dt class="remote"><a href="callto://jfgomez86" title="jfgomez86">Jose Felix Gomez</a>: <span>01:58:33</span></dt><dd>np</dd></dl><A NAME="end_of_document"></A></BODY></HTML>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment