[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Question about manual development

Hello everybody

See these commands :

~/live-manual$ git status
# On branch debian
nothing to commit (working directory clean)

# =========================> Nothing is changed

~/live-manual$ make commit
# Removing useless whitespaces at EOL
for FILE in manual/en/*.ssm manual/en/*.ssi; \
        do \
                sed -i -e 's|[ \t]*$||' ${FILE}; \
Checking for syntax errors... [not implemented yet - FIXME]
Checking for spelling errors... [not implemented yet - FIXME]
make -C manual rebuild
make[1]: se ingresa al directorio `/home/jlz/live-manual/manual'
rm -f po/*/*.po~
rm -f po4a.cfg
rm -rf de es fr it pt_BR ro
Updating version information...
echo "[po4a_langs] de es fr it pt_BR ro" > po4a.cfg
echo "[po4a_paths] pot/\$master.pot \$lang:po/\$lang/\$master.po" >> po4a.cfg
for FILE in en/*.ssm en/*.ssi; \
        do \
                echo "[type: text] ${FILE} \$lang:\$lang/$(basename
${FILE})" >> po4a.cfg; \
echo "[type: xhtml] en/index.html.in \$lang:\$lang/index.html.in" >> po4a.cfg
po4a --keep 0 --no-backups --package-name live-manual  po4a.cfg
 (828 entradas)
for LANGUAGE in de es fr it pt_BR ro; \
        do \
                cp -a en/_sisu ${LANGUAGE}; \
make[1]: se sale del directorio `/home/jlz/live-manual/manual'

Successful... please do:

  * git add .
  * git commit -a -m "Your commit message."
  * git push

#===================================> OK. make commit succesful

~/live-manual$ git status
# On branch debian
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#       modified:   manual/de/live-manual.ssm
#       modified:   manual/en/live-manual.ssm
#       modified:   manual/es/live-manual.ssm
#       modified:   manual/fr/live-manual.ssm
#       modified:   manual/it/live-manual.ssm
#       modified:   manual/po/de/live-manual.ssm.po
#       modified:   manual/po/es/live-manual.ssm.po
#       modified:   manual/po/fr/live-manual.ssm.po
#       modified:   manual/po/it/live-manual.ssm.po
#       modified:   manual/po/pt_BR/live-manual.ssm.po
#       modified:   manual/po/ro/live-manual.ssm.po
#       modified:   manual/pot/live-manual.ssm.pot
#       modified:   manual/pt_BR/live-manual.ssm
#       modified:   manual/ro/live-manual.ssm
no changes added to commit (use "git add" and/or "git commit -a")

# ==========================================> Why ????

:~/live-manual$ git diff manual/de/live-manual.ssm | cat
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 21b88f5..5369b0f 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.<br><br>This program is
distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
for more details.<br><br>You should have received a copy of the GNU
General Public License along with this program. If not, see
http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete
text of the GNU General Public License can be found in
/usr/share/common-licenses/GPL-3 file.

- :published: 2011-02-27
+ :published: 2011-02-28

 @publisher: Debian Live Project <debian-live@lists.debian.org>


This behavior is due to the action of update-version.sh script and it
is source of problems because it causes conflicts when someone push
his version to git repository and you mix your version with git pull.

Is it possible change this behavior ?


José Luis Zabalza
jlz.3008  a t  gmail.com
Linux Counter 172551

Reply to: