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

Proposed by Yann Pouillon
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 Approve
Review via email: mp+372905@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== modified file '.bzrignore'
--- .bzrignore 2018-04-19 10:08:47 +0000
+++ .bzrignore 2019-09-17 16:27:32 +0000
@@ -1,2 +1,4 @@
1*.mod1*.mod
2Obj/*
3\ No newline at end of file2\ No newline at end of file
3Obj/*
4
5/.git
46
=== added directory '.gitlab'
=== added file '.gitlab/CODEOWNERS'
--- .gitlab/CODEOWNERS 1970-01-01 00:00:00 +0000
+++ .gitlab/CODEOWNERS 2019-09-17 16:27:32 +0000
@@ -0,0 +1,16 @@
1#
2# This file specifies who watches which files of the source tree
3#
4
5# Files required by the GNU Autotools
6/AUTHORS @garalb @pouillon
7/COPYING @garalb @pouillon
8#/ChangeLog @garalb @pouillon
9#/INSTALL @garalb @pouillon
10#/NEWS @garalb @pouillon
11/README @garalb @pouillon
12
13# Package maintenance
14/.gitignore @garalb @pouillon
15/.gitlab/ @garalb @pouillon
16/version.info @garalb
017
=== added directory '.gitlab/issue_templates'
=== added file '.gitlab/issue_templates/Migration.md'
--- .gitlab/issue_templates/Migration.md 1970-01-01 00:00:00 +0000
+++ .gitlab/issue_templates/Migration.md 2019-09-17 16:27:32 +0000
@@ -0,0 +1,15 @@
1Migration of @user Launchpad SIESTA branches to Git and Gitlab
2
3Please use the sentence above as title for your issue and make sure you replace `@user` above by your Gitlab login.
4
5Please replace the following example list by the Launchpad URLs of your SIESTA branches, one URL per line:
6
7- lp:~user/siesta/branch1
8- lp:~user/siesta/branch2
9- lp:~user/siesta/branch3
10
11If you don't know where to find your SIESTA branches, you can have a look at the following page:
12
13 https://code.launchpad.net/siesta
14
15Please 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.
016
=== added file 'Obj/.gitignore'
--- Obj/.gitignore 1970-01-01 00:00:00 +0000
+++ Obj/.gitignore 2019-09-17 16:27:32 +0000
@@ -0,0 +1,28 @@
1/.siesta
2/FoX
3/Gaufre
4/Libint
5/Libint_Glue
6/Libs
7/MPI
8/Makefile
9/MatrixSwitch
10/SiestaXC
11/Tests
12/arch.make
13/compinfo.F90
14/config.status
15/fdf
16/fdict
17/gaufre
18/gaufre-[0-9].[0-9].[0-9]
19/libderiv
20/libint
21/libint1_glue.h
22/libr12
23/ncdf
24/siesta
25/tmp.F90
26/work.pcl
27/wxml
28/xmlparser

Subscribers

People subscribed via source and target branches