Skip to content

Commit 0318ea5

Browse files
author
Roberto Di Remigio
committed
Iron out some details with docs that were left out.
1 parent 0826399 commit 0318ea5

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

doc/Maintenance.dox

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,26 @@ If compilation works and all unit tests are passing then the code is ready to be
6363
git push Origin release
6464

6565
Notice that `Origin` has been spelled with a capital `O` the reason being that the release branch gets pushed both to the private
66-
and the public repositories (trick explained [here](http://stackoverflow.com/questions/849308/pull-push-from-multiple-remote-locations))
67-
66+
and the public repositories.
67+
The trick is explained [here](http://stackoverflow.com/questions/849308/pull-push-from-multiple-remote-locations)
68+
in some detail.
69+
In brief, you need to have a `.git/config` file that resembles the following:
70+
71+
\code
72+
[remote "origin"]
73+
url = [email protected]:pcmsolver.git
74+
fetch = +refs/heads/*:refs/remotes/origin/*
75+
[branch "master"]
76+
remote = origin
77+
merge = refs/heads/master
78+
[submodule "external/libgetkw"]
79+
url = git://repo.ctcc.no/libgetkw.git
80+
[remote "GitHub"]
81+
url = [email protected]:PCMSolver/pcmsolver.git
82+
fetch = +refs/heads/*:refs/remotes/GitHub/*
83+
[remote "Origin"]
84+
url = [email protected]:pcmsolver.git
85+
url = [email protected]:PCMSolver/pcmsolver.git
86+
\endcode
6887

6988
*/

tools/counter.py.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ cloc_lists = build+'/cloc'
2121
cloc_script = source+'/tools/cloc.pl'
2222
plots = source+'/doc/gfx/matplotlib'
2323

24+
if not os.path.exists(plots):
25+
os.makedirs(plots)
26+
2427
now = time.strftime('%c')
2528

2629
def cloc_command(*args):

0 commit comments

Comments
 (0)