Merge lp:~pouillon/siesta/migration into lp:siesta

Proposed by Yann Pouillon on 2019-09-17
Status: Merged
Merged at revision: 783
Proposed branch: lp:~pouillon/siesta/migration
Merge into: lp:siesta
Diff against target: 86 lines (+62/-1)
4 files modified
.bzrignore (+3/-1)
.gitlab/CODEOWNERS (+16/-0)
.gitlab/issue_templates/Migration.md (+15/-0)
Obj/.gitignore (+28/-0)
To merge this branch: bzr merge lp:~pouillon/siesta/migration
Reviewer Review Type Date Requested Status
Alberto Garcia 2019-09-17 Approve on 2019-09-18
Review via email: mp+372905@code.launchpad.net
To post a comment you must log in.
Alberto Garcia (albertog) wrote :

Good. Will merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2018-04-19 10:08:47 +0000
3+++ .bzrignore 2019-09-17 16:27:32 +0000
4@@ -1,2 +1,4 @@
5 *.mod
6-Obj/*
7\ No newline at end of file
8+Obj/*
9+
10+/.git
11
12=== added directory '.gitlab'
13=== added file '.gitlab/CODEOWNERS'
14--- .gitlab/CODEOWNERS 1970-01-01 00:00:00 +0000
15+++ .gitlab/CODEOWNERS 2019-09-17 16:27:32 +0000
16@@ -0,0 +1,16 @@
17+#
18+# This file specifies who watches which files of the source tree
19+#
20+
21+# Files required by the GNU Autotools
22+/AUTHORS @garalb @pouillon
23+/COPYING @garalb @pouillon
24+#/ChangeLog @garalb @pouillon
25+#/INSTALL @garalb @pouillon
26+#/NEWS @garalb @pouillon
27+/README @garalb @pouillon
28+
29+# Package maintenance
30+/.gitignore @garalb @pouillon
31+/.gitlab/ @garalb @pouillon
32+/version.info @garalb
33
34=== added directory '.gitlab/issue_templates'
35=== added file '.gitlab/issue_templates/Migration.md'
36--- .gitlab/issue_templates/Migration.md 1970-01-01 00:00:00 +0000
37+++ .gitlab/issue_templates/Migration.md 2019-09-17 16:27:32 +0000
38@@ -0,0 +1,15 @@
39+Migration of @user Launchpad SIESTA branches to Git and Gitlab
40+
41+Please use the sentence above as title for your issue and make sure you replace `@user` above by your Gitlab login.
42+
43+Please replace the following example list by the Launchpad URLs of your SIESTA branches, one URL per line:
44+
45+- lp:~user/siesta/branch1
46+- lp:~user/siesta/branch2
47+- lp:~user/siesta/branch3
48+
49+If you don't know where to find your SIESTA branches, you can have a look at the following page:
50+
51+ https://code.launchpad.net/siesta
52+
53+Please note that migrating all your branches is not mandatory. Feel free to forget about branches that have already been merged into the trunk of SIESTA.
54
55=== added file 'Obj/.gitignore'
56--- Obj/.gitignore 1970-01-01 00:00:00 +0000
57+++ Obj/.gitignore 2019-09-17 16:27:32 +0000
58@@ -0,0 +1,28 @@
59+/.siesta
60+/FoX
61+/Gaufre
62+/Libint
63+/Libint_Glue
64+/Libs
65+/MPI
66+/Makefile
67+/MatrixSwitch
68+/SiestaXC
69+/Tests
70+/arch.make
71+/compinfo.F90
72+/config.status
73+/fdf
74+/fdict
75+/gaufre
76+/gaufre-[0-9].[0-9].[0-9]
77+/libderiv
78+/libint
79+/libint1_glue.h
80+/libr12
81+/ncdf
82+/siesta
83+/tmp.F90
84+/work.pcl
85+/wxml
86+/xmlparser

Subscribers

People subscribed via source and target branches