[prev in list] [next in list] [prev in thread] [next in thread] 

List:       olpc-localization
Subject:    Re: [Localization] Commit errors involving other files
From:       Clytie Siddall <clytie () riverland ! net ! au>
Date:       2010-03-10 9:59:21
Message-ID: 80144AF3-E136-4C3E-BF50-C17ACC9CA409 () riverland ! net ! au
[Download RAW message or body]


On 09/03/2010, at 10:14 PM, Sayamindu Dasgupta wrote:

> Hello,
> 
> On Mon, Mar 8, 2010 at 12:26 PM, Clytie Siddall <clytie@riverland.net.au> wrote:
> > Hi everyone :)
> > 
> > How do we fix commit errors involving files which we can't access?
> > 
> > When I try to commit:
> > 
> > 1.
> > vi/honey/kandid.po
> > 
> > > Failed to commit file: [GIT] pull failed (['git', '--git-dir', \
> > > '/var/lib/pootle/checkouts/honey/kandid/.git', 'pull']): error: Entry \
> > > 'po/de.po' not uptodate. Cannot merge.
> > 
> 
> Fixed - please commit the file :-)
> 
> > 2.
> > vi/glucose/sugar.po
> > 
> > > Failed to commit file: [GIT] pull failed (['git', '--git-dir', \
> > > '/var/lib/pootle/checkouts/glucose/sugar/.git', 'pull']): error: Entry \
> > > 'po/sugar.pot' not uptodate. Cannot merge.
> > 
> > 
> > I'm particularly concerned about sugar.po, because it's a relatively large file.
> > 
> 
> Fixed this one also - the sugar.pot file was recently removed from the
> repository (it is supposed to be generated entirely inside Pootle now)
> and that confused Pootle temporarily. I committed the file for you as
> well.
> 

Thanks to Chris and Sayamindu for their prompt help with this. I do love my green \
bars and tick marks. :)

from Clytie 

Vietnamese Free Software Translation Team

_______________________________________________
Localization mailing list
Localization@lists.laptop.org
http://lists.laptop.org/listinfo/localization


[prev in list] [next in list] [prev in thread] [next in thread]