Goswin von Brederlow <goswin-...@web.de> writes: > Given the above idea how would you lay out the git then?
> With a moments thought I would have 3 branches: > - master > - upstream > - pristine-tar > All developement would happen in the master branch. Then before the > Debian upload I would merge master -> upstream (excluding the debian > dir), roll an orig.tar from upstream and import that into the > pristine-tar branch, tag everything and finally build a non-native > package. This could all be done with a "make release" so it would be > effortless. http://www.eyrie.org/~eagle/notes/debian/git.html If you want upstream to reflect the contents of the release tarball, you want to roll that release from master and then import it into upstream so that you get the generated files. Also see README.source in the openafs source package for another technique for maintaining the upstream branch that I want to move to eventually. -- Russ Allbery (r...@debian.org) <http://www.eyrie.org/~eagle/> -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87vcmgxig3....@windlord.stanford.edu
