Opened 3 weeks ago

Last modified 3 weeks ago

#2414 new Bug

doc does not compile

Reported by: smasson Owned by: systeam
Priority: low Milestone:
Component: doc Version: trunk
Severity: minor Keywords:



In the trunk the doc fails to compile with the following bug:

bash-3.2$ ./ NEMO
        ¤ Generation of the PDF format
Latexmk: RC file [./latex/global/] does not exist

        ¤ End of building run


The compilation of the v4-HEAD works.
the file release-4.0-HEAD/doc/latex/global/ does exist whereas there is no such a file in trunk/doc/latex/global
I don't know why…


copying release-4.0-HEAD/doc/latex/global/ into trunk/doc/latex/global seems to do the job…
but I don't know if it is the good solution…

Commit History (0)

(No commits)

Change History (2)

comment:1 Changed 3 weeks ago by smasson

Some additional informations:

From Simon:

1) in the trunk seems to have appeared with [11591] and to have disappeared with [12182] upstream of the trunk update of the 2019 merge; the commit message suggests that [12182] "merges in dev_ASINTER-01-05_merge" (presumably source:/NEMO/branches/2019/dev_ASINTER-01-05_merged).
2) Apparently :
source:/NEMO/branches/2019/dev_ASINTER-01-05_merged started from
source:NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D@11945, which started from
source:/NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization@11268, which started from

[12182] merge source:/NEMO/branches/2019/dev_ASINTER-01-05_merged@12165

[12165] 2019/dev_ASINTER-01-05_merged: Update to r12072 of trunk. merge source:/NEMO/trunk@12072
source:NEMO/branches/2019/dev_ASINTER-01-05_merged/doc/latex/global@12164 does not contain
source:/NEMO/trunk/doc/latex/global@12072 contains the file
source:NEMO/branches/2019/dev_ASINTER-01-05_merged/doc/latex/global@12165 still does not contain

→ why?
→ Was the merge properly done (with svn merge and not "by hand")?
→ With which version of the trunk was merged source:NEMO/branches/2019/dev_ASINTER-01-05_merged/doc/latex/global@12164 ?
Which version of svn was used? With the release of Subversion 1.7 the svn merge subcommand disables merges into mixed-revision working copies by default. It gives an error like:

svn: E195020: Cannot merge into mixed-revision working copy 


if we look at the revision log of source:/NEMO/branches/2019/dev_ASINTER-01-05_merged@12165:
We see some "multiple merge" in a single commit:
[12063] dev_ASINTER-01-05_merged: update branch with dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk@r12061 and trunk@r12055
but still no… copying from the trunk
[12015] dev_ASINTER-01-05_merged: merge dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk branch @rev11988 with dev_r11265_ASINTER-01_Guillaume_ABL1D branch @rev11937
→ how was this done?

if we look at [12015] nothing is done on the doc directory but:
source:NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/doc/latex/global@11988 does contain
because of [11831] dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk: Update the branch to r11830 of the trunk!

If we look at dev_r11265_ASINTER-01_Guillaume_ABL1D revision log:
The last merge of this branch with the trunk seems to be:
[11587] dev_r11265_ASINTER-01_Guillaume_ABL1D: merge trunk @ r11584 with dev_r11265_ABL … so before the addition of in the trunk.

comment:2 Changed 3 weeks ago by smasson

clearly we have to remove most of the modifications done on the doc/latex in [12182]
or in [12063] which looks very similar

but we have to keep some of these changes…

I propose to take the changes done "intentionally" in the following branches and modified by [12063] or [12182]

Note: See TracTickets for help on using tickets.