[Sugar-devel] Fwd: Cron <pootle at pootle> /var/lib/pootle/maintenance/helpers/potupdater/check_unmerged_translations.sh

[Gonzalo Odiard]

Today I have found a new problem in Pootle:
The script checking unmerged translations say:

---------- Forwarded message ----------
From: Cron Daemon <root at pootle.sugarlabs.org>
Date: Wed, Jan 19, 2011 at 2:50 AM
Subject: Cron <pootle at pootle>
/var/lib/pootle/maintenance/helpers/potupdater/check_unmerged_translations.sh
To: godiard at sugarlabs.org

One or more checkouts have merge or pull conflicts.
---
/var/lib/pootle/checkouts/fructose/pippy-activity: # Your branch is behind
'origin/master' by 2 commits, and can be fast-forwarded.

I go to the directory and try:

root at pootle:/var/lib/pootle/checkouts/fructose/pippy-activity# sudo -u
pootle git pull
Updating 2a44705..c0b9a64
error: Entry 'po/da.po' not uptodate. Cannot merge.

1!root at pootle:/var/lib/pootle/checkouts/fructose/pippy-activity# sudo -u
pootle git log po/da.po
commit 5f866ced3a490a3b18f81e433d96a1a196a3d811
Author: Pootle daemon <pootle at sugarlabs.org>
Date:   Thu Sep 3 10:06:44 2009 -0400

    Adding language da via Pootle

"git log" in Pootle server show only commit translations, in my machine is
completely different.
Is like we have two different repositories.

In the Pootle server, the url in .git/config is
    url = git+ssh://dev.laptop.org/git/projects/pippy-activity
in my machine (with sugar-jhbuild instalation) is
    url = git://git.sugarlabs.org/pippy/mainline.git

Anybody knows what happen here? The activity changed the repository and
Pootle was not updated?
Is on purpose?
Thanks

Gonzalo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20110119/cbd2f504/attachment-0001.html>