Hello Guillem,
On Wed, Jan 08, 2020 at 05:30:11PM +0100, Guillem Jover wrote:
> On Tue, 2020-01-07 at 09:28:36 +0100, Helge Kreutzmann wrote:
> Given that I think the strings have already diverged, I'm not sure
> cherry-picking translation commits from master will give no conflicts.
> So perhaps you'll have a way easier time to untangle this by copying
> the .po files that you want to carry over somewhere out of tree, then
> reset your local 1.19.x branch with something like:
>
> # Let's first do a backup to not lose any changes.
> $ git branch -c 1.19.x backup-1.19.x
[works]
> $ git checkout 1.19.x
[works]
> $ cp man/po/de.po out-of-tree-de.po
[works]
> $ git reset --hard origin/1.19.x
[works]
> $ cp out-of-tree-de.po man/po/de.po
[works]
> $ make -C man update-po
helge@samd:/scr/build/src/DCS/dpkg.git/dpkg$ LC_ALL=C make -C man update-po
make: Entering directory '/scr/build/src/DCS/dpkg.git/dpkg/man'
make: *** No rule to make target '../m4/arch.m4', needed by 'Makefile.in'. Stop.
make: Leaving directory '/scr/build/src/DCS/dpkg.git/dpkg/man'
… but this I can manage …
> $ git commit man/po/de.po
[works]
> $ git checkout -- man/po
[works, i.e. no output]
> Then check with «git log -p» and/or «git show» that this looks as
> expected and push that. But if you get stuck again we can continue
> from there. :)
Yes, this looks fine now.
I pushed it, so please tell me if anything from your side is not
correct.
Thanks for the help.
Greetings
Helge
--
Dr. Helge Kreutzmann debian@helgefjell.de
Dipl.-Phys. http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
Help keep free software "libre": http://www.ffii.de/
Attachment:
signature.asc
Description: PGP signature