I have updated the url git in Pootle. If anybody knows about other projects with changed repository, tell me and we can check if the Pootle server is updated. Gonzalo <div class="gmail_quote">On Wed, Jan 19, 2011 at 11:09 AM, Gonzalo Odiard <<a href="mailto:gonzalo@laptop.org">gonzalo@laptop.org</a>> wrote: <blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">Today I have found a new problem in Pootle: The script checking unmerged translations say:<div> <div></div><div class="h5"> <div class="gmail_quote">---------- Forwarded message ---------- From: Cron Daemon <<a href="mailto:root@pootle.sugarlabs.org" target="_blank">root@pootle.sugarlabs.org</a>> Date: Wed, Jan 19, 2011 at 2:50 AM Subject: Cron <pootle@pootle> /var/lib/pootle/maintenance/helpers/potupdater/check_unmerged_translations.sh To: <a href="mailto:godiard@sugarlabs.org" target="_blank">godiard@sugarlabs.org</a> 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. </div> </div></div>I go to the directory and try: root@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@pootle:/var/lib/pootle/checkouts/fructose/pippy-activity# sudo -u pootle git log po/da.po commit 5f866ced3a490a3b18f81e433d96a1a196a3d811 Author: Pootle daemon <<a href="mailto:pootle@sugarlabs.org" target="_blank">pootle@sugarlabs.org</a>> 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://<a href="http://dev.laptop.org/git/projects/pippy-activity" target="_blank">dev.laptop.org/git/projects/pippy-activity</a> in my machine (with sugar-jhbuild instalation) is url = git://<a href="http://git.sugarlabs.org/pippy/mainline.git" target="_blank">git.sugarlabs.org/pippy/mainline.git</a> Anybody knows what happen here? The activity changed the repository and Pootle was not updated? Is on purpose? Thanks Gonzalo </blockquote></div>