On Mon, Feb 8, 2010 at 9:15 PM, Yuan Chao <span dir="ltr"><<a href="mailto:yuanchao@gmail.com">yuanchao@gmail.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div class="im"><br>
</div>Hi cjl,<br>
<br>
I'm trying to commit the POs marksed as "not checked" in Pootle 2.0. Most<br>
of them become "checked" without problem. However, I've got some of them<br>
with the following error:<br>
<br>
Failed to commit file: [GIT] pull failed (['git', '--git-dir',<br>
'/var/lib/pootle/checkouts/fructose82/calculate-activity/.git',<br>
'pull']): You asked me to pull without telling me which branch you<br>
want to merge with, and 'branch.sucrose-0.82.merge' in your<br>
configuration file does not tell me either. Please specify which<br>
branch you want to merge on the command line and try again (e.g. 'git<br>
pull <repository> <refspec>'). See git-pull(1) for details. If you<br>
often merge with the same branch, you may want to configure the<br>
following variables in your configuration file:<br>
branch.sucrose-0.82.remote = <nickname> branch.sucrose-0.82.merge =<br>
<remote-ref> remote.<nickname>.url = <url> remote.<nickname>.fetch =<br>
<refspec> See git-config(1) for details.<br>
<br>
Do you know how should I fix them? Thanks.<br>
<div class="im"><br></div></blockquote><div><br><br>Yuan,<br><br>That looks like some sort of error in the connection between Pootle and git on the back-end. That is type of magic that Sayamindu typically handles. Hopefully he can look into this and get back to you on the list. <br>
<br>I've filed this ticket in Trac so that it won't get forgotten.<br><a href="http://dev.sugarlabs.org/ticket/1716">http://dev.sugarlabs.org/ticket/1716</a><br><br>cjl<br></div></div>