[bornagain] 04/04: debian/README.source: document the branch layout

Mika Pflüger mikapfl-guest at moszumanska.debian.org
Mon Nov 21 10:21:53 UTC 2016


This is an automated email from the git hooks/post-receive script.

mikapfl-guest pushed a commit to branch debian
in repository bornagain.

commit 20081e30688ec295d3cc12787f564dbbbdf9858f
Author: Mika Pflüger <mika at mikapflueger.de>
Date:   Sat Nov 19 16:08:12 2016 +0100

    debian/README.source: document the branch layout
---
 debian/README.source | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..b65f69c
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+Because the upstream BornAgain tarballs differ quite significantly from the upstream git repository (most notably, the pdf manual is missing from the tarballs) but it is still pretty useful to have the full upstream git history available, the branch layout is like this:
+* debian: the debian packaging
+* upstream: the upstream tarball releases (imported with pristine-tar), merged into debian after a new upstream release
+* upstream-git/master: the upstream git master branch, never merged into the upstream or debian branches. Instead, cherry-picking from upstream-git/master to debian is done if needed.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/bornagain.git



More information about the debian-science-commits mailing list