#83 fr-current Title missing

[Anonymous]

Originally created by: oXid...@gmail.com

trunk/src/fr/book/ch04-branching-and-merging.xml@3734#742

FR translation of "Reintegrating a Branch" is missing.

correction suggested (I don't know at all DocBook syntax, so maybe I'm wrong): add these lines at line 742 :

    <!-- =============================================================== -->
    <sect2 id="svn.branchemerge.basicmerging.reintegrate">
      <title>Réintégrer une branche</title>

[Anonymous]

Originally posted by: SubVersi...@gmail.com

The "Réintégrer une branche" title is not present in the FR translation because it is part of the svnbook EN 1.6 version only. It was not in 1.5.

As the French translation is currently about the 1.5 book, the 1.6 updates are not being merged yet.

Once the 1.5 FR definitive version is ready and tagged, all changes from 1.6 EN version will be carried over to the FR nightly version. In other words, the "Réintégrer une branche" title will indeed be added, at some point.

Status: Invalid

[Anonymous]

Originally posted by: oXid...@gmail.com

I don't know if this is something related to 1.6 or 1.5
All I see is there is the full paragraph about reintegrating in current FR book. You can check...

So, either a title is missing, either there is some extra-information.

[Anonymous]

Originally posted by: oXid...@gmail.com

if you don't speak french, take a look at examples... you can read this command "svn merge --reintegrate" in 1.5 FR book.

[Anonymous]

Originally posted by: christophe.nanteuil@gmail.com

maybe this could reformulate the answer of Subversif :
1/ svn log -r 3660 trunk/src/fr/book/ch04-branching-and-merging.xml
2/ svn cat -r 3305 trunk/scr/fr/book/ch04-branching-and-merging.xml