[Debian-handbook-translators] Please review what you push

Raphael Hertzog hertzog at debian.org
Fri Mar 8 07:56:52 UTC 2013


Hi Zaki,

this cannot continue. It's the second time that you push stuff from the
master branch to squeeze/master.

Please do a copy of your PO files if you have pending changes, and run the
following commands in your git repository:

$ git checkout -f squeeze/master
$ git fetch
$ git reset --hard origin/squeeze/master

And now before doing ANY git push, please run the following command and make sure
that it lists only commits of your own! If not, backup your PO files and rerun the
commands above...

$ git log --stat @{u}..HEAD

Thank you in advance.

PS: This time I went backwards in the history instead of sending out
proper revert commits. If you update the repository, you might want
to resync properly with the above git fetch && git reset --hard origin/squeeze/master.
Beware that you will loose any local commits or pending changes. So backup
your PO files if needed.

On Thu, 07 Mar 2013, Zaki Akhmad wrote:
> The following commit has been merged in the squeeze/master branch:
> commit 030cfca8cc422cda58b086c8a8ad01d73dbfc991
> Author: Raphaël Hertzog <hertzog at debian.org>
> Date:   Sun Dec 23 20:35:52 2012 +0100
> 
>     Be explicit about the need to run dpkg-reconfigure as root
> 
> diff --git a/en-US/08_basic-configuration.xml b/en-US/08_basic-configuration.xml
> index bd9a09e..b8bbb41 100644
> --- a/en-US/08_basic-configuration.xml
> +++ b/en-US/08_basic-configuration.xml
> @@ -127,7 +127,7 @@
>        “localization” for various applications. During installation,
>        this package will ask a few questions in order to choose supported
>        languages. This set of supported languages can be changed by running
> -      <command>dpkg-reconfigure locales</command>.</para>
> +      <command>dpkg-reconfigure locales</command> as root.</para>
>  
>        <para>You will be asked, first, to choose what “locales” to
>        include. Selecting all English locales (meaning those beginning
> 
> -- 
> Git repository for debian-handbook
> 

-- 
Raphaël Hertzog ◈ Debian Developer

Get the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/



More information about the Debian-handbook-translators mailing list