Hey Clytie,<br><br><div class="gmail_quote">On Mon, Mar 8, 2010 at 1:56 AM, Clytie Siddall <span dir="ltr"><<a href="mailto:clytie@riverland.net.au">clytie@riverland.net.au</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi everyone :)<br>
<br>
How do we fix commit errors involving files which we can't access?<br>
<br>
When I try to commit:<br>
<br>
1.<br>
vi/honey/kandid.po<br>
<br>
> Failed to commit file: [GIT] pull failed (['git', '--git-dir', '/var/lib/pootle/checkouts/honey/kandid/.git', 'pull']): error: Entry 'po/de.po' not uptodate. Cannot merge.<br>
<br></blockquote><div><br>This is a known issue for Kandid:<br><a href="http://bugs.sugarlabs.org/ticket/1629">http://bugs.sugarlabs.org/ticket/1629</a><br><br>Unfortunately, it has to do with the developer touching files within the /po directory (without going through Pootle). Until it is straightened out, kandid.po files probably will not get committed. This is not critical because Honey doesn't follow Sugar release cycle anyway.<br>
<br> </div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
2.<br>
vi/glucose/sugar.po<br>
<br>
> Failed to commit file: [GIT] pull failed (['git', '--git-dir', '/var/lib/pootle/checkouts/glucose/sugar/.git', 'pull']): error: Entry 'po/sugar.pot' not uptodate. Cannot merge.<br>
<br>
<br>
I'm particularly concerned about sugar.po, because it's a relatively large file.<br>
<br>
<br></blockquote><div><br>I'm not sure about this one. The error message is the same as the ticket below on typing turtle. <br><br><a href="http://bugs.sugarlabs.org/ticket/1631">http://bugs.sugarlabs.org/ticket/1631</a><br>
<br>I agree that sugar.po is an important file. Sayamindu will have to look
into this.<br><br></div></div>cjl<br>