On Wed, Nov 05, 2008 at 11:11:28PM -0800, Karsten 'quaid' Wade wrote:
> On Thu, Nov 06, 2008 at 11:08:29AM +1000, Noriko Mizumoto wrote:
>
> > Paul, don't worry it does not destroy, but the situation seems not nice.
> > This is how I am understanding and had experience when used to work on cvs.
> > The translator has been working the file on her machine not commit it to
> > the repository yet, let's say the version 1.0. Beside the author updated
> > this version with some change resulting the version 1.1. Now the
> > translator tried to commit the file worked, but she got error message
> > saying the file is conflict. Because the repository has latest version of
> > 1.1, while she is still trying to commit version 1.0.
> > She needs to merge her file of 1.0 and 1.1 locally before commit. If
> > there are 10 translators, this local merge must be done for each language.
> > If the author notified translators to commit before update, this merge is
> > not required.
>
> If we can actually use git, we may find these merges a lot easier
> because git is a better tool than cvs.
>
> > Now I see strange thing here, and need some help.
> > I did 'git pull', so I got latest PO files with 1024 strings intead 1030.
> > I did test commit po_BR.po translated with 1030 strings against latest
> > pt_BR.po with 1024 strings.
> >
> > [noriko@noriko po]$ git commit -m 'commit test' pt_BR.po
> > Created commit dd92755: commit test
> > 1 files changed, 1035 insertions(+), 4134 deletions(-)
> >
> > I got no error, but it seems overwritten when I see log.
>
> I just did a 'git pull' and this is what I see:
>
> [kwade@calliope release-notes {master}]$ git log po/pt_BR.po
> commit f3595ce789f269f53a6634688e468f93907717b0
> Author: Paul W. Frields <stickster@xxxxxxxxx>
> Date: Tue Nov 4 09:35:20 2008 -0500
>
> Update POT and PO files
> ...
>
> Where is your commit?
>
> It is where it belongs, on your machine in your local repository.
> Until you do 'git push', you do not merge your local repo to the
> remote one.
[...snip...]
I suspect this is the case -- that Noriko has a local commit that's
not been pushed. Since it's got a "commit test" log message that's
probably reasonable.
Noriko, it would be helpful if we understood how translators are
working? How do they retrieve POT or PO files? When and how do they
submit their work back to the repository?
We will refrain from updating POT or PO further except for scheduled
drops, but we should probably develop instructions for translators
that will help them make better use of the tools available, and rely
less on restrictive manual policies.
--
Paul W. Frields http://paul.frields.org/
gpg fingerprint: 3DA6 A0AC 6D58 FEC4 0233 5906 ACDB C937 BD11 3717
http://redhat.com/ - - - - http://pfrields.fedorapeople.org/
irc.freenode.net: stickster @ #fedora-docs, #fedora-devel, #fredlug
Attachment:
pgpme6KBlxs0C.pgp
Description: PGP signature
-- fedora-docs-list mailing list fedora-docs-list@xxxxxxxxxx To unsubscribe: https://www.redhat.com/mailman/listinfo/fedora-docs-list
