Re: [Lxde-i18n] Commit to vcs

[Martin B. / b. <br...@bs...>]

On Wed, 24 Oct 2012, Mișu Moldovan wrote:

> Failed to commit file: [GIT] push of
> ('/var/lib/pootle/po/lxde/pcmanfm', 'po/ro.po') failed: To
> ssh://br...@pc.../gitroot/pcmanfm/pcmanfm !
> [rejected] master -> master (non-fast-forward) error: failed to push
> some refs to 'ssh://br...@pc.../gitroot/pcmanfm/pcmanfm'

push fail not commit fail.
git internals.

> To prevent you from losing history, non-fast-forward updates were
> rejected Merge the remote changes (e.g. 'git pull') before pushing
> again. See the 'Note about fast-forwards' section of 'git push --help'
> for details.

And the automatic repo sync fixed this error. no worries. if you see it in 
the future just drop me a mail, it should be noted in my warnings but more 
logs are always better =)

> Now commiting fails with:
>
> Failed to commit file: [GIT] commit of
> ('/var/lib/pootle/po/lxde/pcmanfm', 'po/ro.po') failed:
> # modified: po/he.po
> # modified: po/hr.po
> # modified: po/ko.po
> # modified: po/pt.po
> # modified: po/pt_BR.po

As po/ro.po was not listed here no modification was found and no commit 
could be done. This is normal, no failure. I assume this commit + push 
solved the push problem from earlier. Good thing =)

> Manual intervention seems to be needed here.

Nope. The automatics solved it all =)

commit 0b0281492833f645b0845ed8aaf864d3fda50fbe
Author: dumol <du...@l1...>
Date:   Tue Oct 23 23:01:09 2012 +0200

And that is pushed and all is well.

-- 
/brother
http://martin.bagge.nu
If you use the digits of Pi to generate a visual image, it draws a picture of Bruce Schneier.