#8242: Fix duplicate citation warnings when building the French-language
tutorial
------------------------------------------------+---------------------------
Reporter: mpatel | Owner: mmezzarobba
Type: defect | Status: needs_work
Priority: minor | Milestone: sage-4.3.4
Component: documentation | Keywords:
Author: Marc Mezzarobba | Upstream: N/A
Reviewer: Paul Zimmermann, Minh Van Nguyen | Merged:
Work_issues: |
------------------------------------------------+---------------------------
Changes (by mvngu):
* status: positive_review => needs_work
Comment:
The attachment
[http://trac.sagemath.org/sage_trac/attachment/ticket/8242/trac_8242_duplicate_citations.patch
trac_8242_duplicate_citations.patch] conflicts with ticket #8037, in
particular the patch
[http://trac.sagemath.org/sage_trac/attachment/ticket/8037/trac_8037_sagetex_french_tutorial.2.patch
trac_8037_sagetex_french_tutorial.2.patch] on that ticket. Here's the hunk
failure resulting from first applying #8037, followed by the first patch
on #8242:
{{{
[mv...@sage sage-main]$ pwd
/dev/shm/mvngu/sandbox/sage-4.3.3-8242/devel/sage-main
[mv...@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-
attachment/ticket/8037/trac_8037_sagetex_french_tutorial.2.patch && hg
qpush
adding trac_8037_sagetex_french_tutorial.2.patch to series file
applying trac_8037_sagetex_french_tutorial.2.patch
now at: trac_8037_sagetex_french_tutorial.2.patch
[mv...@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-
attachment/ticket/8242/trac_8242_duplicate_citations.patch && hg qpush
adding trac_8242_duplicate_citations.patch to series file
applying trac_8242_duplicate_citations.patch
patching file doc/fr/tutorial/introduction.rst
Hunk #1 FAILED at 62
1 out of 2 hunks FAILED -- saving rejects to file
doc/fr/tutorial/introduction.rst.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh
trac_8242_duplicate_citations.patch
[mv...@sage sage-main]$ cat doc/fr/tutorial/introduction.rst.rej
--- introduction.rst
+++ introduction.rst
@@ -63,7 +63,7 @@
Des instructions pour installer Sage sur votre ordinateur sont
disponibles dans le guide d'installation (*Installation Guide*), dans
-la section documentation de la page web principale de Sage [Sage]_.
+la section documentation de la page web principale de Sage [SA]_.
Nous nous limiterons ici à deux remarques.
#. La version téléchargeable de Sage vient avec ses dépendances.
}}}
On the one hand, ticket #8037 wants to make the change
{{{
#!diff
- la section documentation de la page web principale de Sage [SA]_.
+ la section documentation de la page web principale de Sage [Sage]_.
}}}
But the current ticket (i.e. #8242) wants to make the change
{{{
#!diff
-la section documentation de la page web principale de Sage [Sage]_.
+la section documentation de la page web principale de Sage [SA]_.
}}}
The patches on this ticket needs to be rebased on top of #8037.
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/8242#comment:7>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
