Hi Markus.<div><br><div class="gmail_quote">On Mon, May 2, 2011 at 4:21 PM, Markus Schlager <span dir="ltr"><<a href="mailto:m.slg@gmx.de" target="_blank">m.slg@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Chris,<br>
<br>
I'm getting this sort of error:<br>
<br>
---8X-------------------------------<br>
Failed to commit file: [GIT] commit of<br>
('/var/lib/pootle/checkouts/fructose82/log-activity', 'po/de.po') failed:<br>
fatal: 'commit' is not possible because you have unmerged files. Please,<br>
fix them up in the work tree, and then use 'git add/rm <file>' as<br>
appropriate to mark resolution and make a commit, or use 'git commit -a'.<br>
---X8-------------------------------<br>
<br>
---8X-------------------------------<br>
Failed to commit file: [GIT] push of<br>
('/var/lib/pootle/checkouts/fructose82/chat-activity', 'po/de.po') failed:<br>
Host key fingerprint is 4f:5e:5c:7f:ca:94:49:9d:2e:77:85:86:7c:de:56:f1<br>
+--[ RSA 2048]----+ | . | | . . o+| | o *.E| | . *.=o| | S . o.=o*| | + .<br>
oooo| | o o | | | | | +-----------------+ remote: => Syncing Gitorious...<br>
[OK] To gitorious@git.sugarlabs.org:chat/mainline.git c4e5ac2..09b5740<br>
sucrose-0.82 -> sucrose-0.82 ! [rejected] master -> master<br>
(non-fast-forward) error: failed to push some refs to<br>
'gitorious@git.sugarlabs.org:chat/mainline.git'<br>
---X8-------------------------------<br>
<br>
---8X-------------------------------<br>
Failed to commit file: [GIT] commit of<br>
('/var/lib/pootle/checkouts/fructose82/calculate-activity', 'po/de.po')<br>
failed: # On branch sucrose-0.82 # Changed but not updated: # (use "git<br>
add <file>..." to update what will be committed) # (use "git checkout --<br>
<file>..." to discard changes in working directory) # # modified: po/am.po<br>
# modified: po/ar.po # modified: po/bn.po # modified: po/ca.po # modified:<br>
po/el.po # modified: po/en.po # modified: po/es.po # modified: po/fa_AF.po<br>
# modified: po/fr.po # modified: po/hi.po # modified: po/ht.po # modified:<br>
po/is.po # modified: po/it.po # modified: po/km.po # modified: po/mk.po #<br>
modified: po/mn.po # modified: po/mr.po # modified: po/nb.po # modified:<br>
po/ne.po # modified: po/nl.po # modified: po/pa.po # modified: po/pap.po #<br>
modified: po/pl.po # modified: po/ps.po # modified: po/pseudo.po #<br>
modified: po/pt.po # modified: po/pt_BR.po # modified: po/ro.po #<br>
modified: po/rw.po # modified: po/si.po # modified: po/sl.po # modified:<br>
po/ur.po # modified: po/vi.po # modified: po/yo.po # modified: po/zh_CN.po<br>
# modified: po/zh_TW.po # # Untracked files: # (use "git add <file>..." to<br>
include in what will be committed) # # messages.mo # po/messages.mo no<br>
changes added to commit (use "git add" and/or "git commit -a")<br>
---X8-------------------------------<br>
<br>
What am I supposed to do? I translated some of the files locally using<br>
virtaal an poedit.<br>
<br>
Markus<br>
_______________________________________________<br>
Localization mailing list<br>
<a href="mailto:Localization@lists.laptop.org" target="_blank">Localization@lists.laptop.org</a><br>
<a href="http://lists.laptop.org/listinfo/localization" target="_blank">http://lists.laptop.org/listinfo/localization</a><br>
</blockquote></div><br></div><div>I think these fructose82 branches are deprecated, log, calculate </div><div>and chat are now honey projects. </div><div><br></div><div>These errors you are seeing are repo errors, providing that these branches are deprecated wont be valuable to have this fixed,</div>
<div>if these 82 branches are still on use we should fix it then. </div><div><br></div><div> </div><div><br></div><div> </div>