Hello Nicholas, On Thu, Jun 08, 2017 at 06:14:53PM -0400, Nicholas D Steeves wrote: > Do you think the following is the best course of action?: > > Rename master-nonfree to something that better signifies it's only > used for merging (from upstream git remote) upstream docs; document > this somehow (README.sources? In both branches, or just in one of > them?); maybe drop upstream-nonfree, strip out all non-docs from > newname-for-master-nonfree, and build the non-free emacs-ivy-docs > orig.source using deborig? This orig.source seems like it only needs > to contain the emacs-ivy/docs subdir. Finally, debian/* on the > newname-for-master-nonfree branch would need to be modified. Renaming branches is equivalent to rewinding history, so please avoid that. We're going to need two source packages, so I think we should have two repos, organised like this: emacs-ivy-doc -- just 'master' branch emacs-ivy -- 'upstream' branch with cleaned sources, 'master' branch including debian/ dir -- Sean Whitton
Attachment:
signature.asc
Description: PGP signature