[Localization] Problems committing fructose0.82/0.84

[Rafael Ortiz]

Hi Markus.

On Mon, May 2, 2011 at 4:21 PM, Markus Schlager <m.slg at gmx.de> wrote:

> Hi Chris,
>
> I'm getting this sort of error:
>
> ---8X-------------------------------
> Failed to commit file: [GIT] commit of
> ('/var/lib/pootle/checkouts/fructose82/log-activity', 'po/de.po') failed:
> fatal: 'commit' is not possible because you have unmerged files. Please,
> fix them up in the work tree, and then use 'git add/rm <file>' as
> appropriate to mark resolution and make a commit, or use 'git commit -a'.
> ---X8-------------------------------
>
> ---8X-------------------------------
> Failed to commit file: [GIT] push of
> ('/var/lib/pootle/checkouts/fructose82/chat-activity', 'po/de.po') failed:
> Host key fingerprint is 4f:5e:5c:7f:ca:94:49:9d:2e:77:85:86:7c:de:56:f1
> +--[ RSA 2048]----+ | . | | . . o+| | o *.E| | . *.=o| | S . o.=o*| | + .
> oooo| | o o | | | | | +-----------------+ remote: => Syncing Gitorious...
> [OK] To gitorious at git.sugarlabs.org:chat/mainline.git c4e5ac2..09b5740
> sucrose-0.82 -> sucrose-0.82 ! [rejected] master -> master
> (non-fast-forward) error: failed to push some refs to
> 'gitorious at git.sugarlabs.org:chat/mainline.git'
> ---X8-------------------------------
>
> ---8X-------------------------------
> Failed to commit file: [GIT] commit of
> ('/var/lib/pootle/checkouts/fructose82/calculate-activity', 'po/de.po')
> failed: # On branch sucrose-0.82 # Changed but not updated: # (use "git
> add <file>..." to update what will be committed) # (use "git checkout --
> <file>..." to discard changes in working directory) # # modified: po/am.po
> # modified: po/ar.po # modified: po/bn.po # modified: po/ca.po # modified:
> po/el.po # modified: po/en.po # modified: po/es.po # modified: po/fa_AF.po
> # modified: po/fr.po # modified: po/hi.po # modified: po/ht.po # modified:
> po/is.po # modified: po/it.po # modified: po/km.po # modified: po/mk.po #
> modified: po/mn.po # modified: po/mr.po # modified: po/nb.po # modified:
> po/ne.po # modified: po/nl.po # modified: po/pa.po # modified: po/pap.po #
> modified: po/pl.po # modified: po/ps.po # modified: po/pseudo.po #
> modified: po/pt.po # modified: po/pt_BR.po # modified: po/ro.po #
> modified: po/rw.po # modified: po/si.po # modified: po/sl.po # modified:
> po/ur.po # modified: po/vi.po # modified: po/yo.po # modified: po/zh_CN.po
> # modified: po/zh_TW.po # # Untracked files: # (use "git add <file>..." to
> include in what will be committed) # # messages.mo # po/messages.mo no
> changes added to commit (use "git add" and/or "git commit -a")
> ---X8-------------------------------
>
> What am I supposed to do? I translated some of the files locally using
> virtaal an poedit.
>
> Markus
> _______________________________________________
> Localization mailing list
> Localization at lists.laptop.org
> http://lists.laptop.org/listinfo/localization
>

I think these fructose82 branches are deprecated, log, calculate
and chat are now honey projects.

These errors you are seeing are repo errors, providing that these branches
are deprecated wont be valuable to have this fixed,
if these 82 branches are still on use we should fix it then.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.laptop.org/pipermail/localization/attachments/20110502/51c5ae69/attachment.htm