Hi,

On Sun, 06 Jul 2008, Kenshi Muto wrote:
> The following commit has been merged in the master branch:
> commit 4174eea758751055dc36caf3941368fe12148bd9
> Author: Kenshi Muto <kmuto@debian.org>
> Date: Sun Jul 6 18:41:12 2008 +0900
>
> update Japanese translation

Please don't start translating the master branch until Lenny is released.
It will complicate merging from one branch to the other.

Cheers,
--
Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/


--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

Hi Raphael,

At Sun, 6 Jul 2008 12:23:33 +0200,
Raphael Hertzog wrote:
> Please don't start translating the master branch until Lenny is released.
> It will complicate merging from one branch to the other.

Sorry. I did it because I got an error when was commiting once
for lenny branch.
Anyway I memorize your advice for next time.

Thanks,
--
Kenshi Muto
kmuto@debian.org


--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

Quoting Raphael Hertzog (hertzog@debian.org):

> Please don't start translating the master branch until Lenny is released.
> It will complicate merging from one branch to the other.


I'm not convinced this would be a great idea to merge po/ directories
with the VCS merge facilities.

I think that the following would be much more efficient:

(assuming that a copy of the lenny branch is in lenny/ and a copy of
master is in master/)

cd master/po
(do all magic to update dpkg.pot with current source)
mkdir NEW
for i in *.po*; do
if [ -f ../../lenny/po/$i ]*; then
msgcat --use-first ../../lenny/po/$i $i >NEW/$i
msgmerge -U NEW/$i dpkg.pot
fi
done
mv NEW/* .
rmdir NEW

The "git add *.po" and "git commit -m'Resync with lenny branch'"

That would guarantee a better and more efficient merge and fuzzy
matching as that will use the gettext functions for that.

I would recommend repeating this for all po/ directories.

On Sun, 06 Jul 2008, Christian Perrier wrote:
> I'm not convinced this would be a great idea to merge po/ directories
> with the VCS merge facilities.

If we have conflicts, the merge is a pain and we should use msgmerge to
merge properly both files.

But if we have no conflicts (because the po files have not been modified
since the creation of the branch that we're merging), then the VCS merge
functionnality is fine...

> I think that the following would be much more efficient:

It would be great to have such a script to merge all translations from
another branch in the current branch.

> (assuming that a copy of the lenny branch is in lenny/ and a copy of
> master is in master/)

One should not make such an assumption... we have a single repository in
the git model. But we have tools to use to extract files from another
branch.

git-unpack-file / git-cat-file to extract blog objects
but I don't know yet how to identify the blog id of a given file in
another branch.

Cheers,
--
Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/


--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

On Sun, 06 Jul 2008, Raphael Hertzog wrote:
> It would be great to have such a script to merge all translations from
> another branch in the current branch.
>
> > (assuming that a copy of the lenny branch is in lenny/ and a copy of
> > master is in master/)
>
> One should not make such an assumption... we have a single repository in
> the git model. But we have tools to use to extract files from another
> branch.
>
> git-unpack-file / git-cat-file to extract blog objects
> but I don't know yet how to identify the blog id of a given file in
> another branch.

"git show <branch>:<filename> --" is the proper answer apparently.

Cheers,
--
Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/


--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

Hello,

On Sun, Jul 06, 2008 at 11:01:12AM -0700, Russ Allbery wrote:
>
> It looks like the only hard part would be finding the *.pot file with
> which to msgmerge.

msgmerge is not necessary. msgcat will take care of merging the two PO
files.
The final merge will be done by make update-po.

Best Regards,
--
Nekral


--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org