On Tue, Jan 23, 2007 at 10:02:05PM +1100, Andrew Donnellan wrote: > > So essentially, store debian/ etc in the upstream VCS, but keep it out > of releases and only add the directory when building a Debian package? > > Does this mean I should create a snapshot of everything except the > debian files, then copy the debian files in to make a diff? > A parallel branch structure might make sense in your case. Then you can just merge trunk changes up to your branch periodically. As long as you use dpatch and don't touch any "upstream" files, you will never have a conflict. Regards, -Roberto -- Roberto C. Sanchez http://people.connexer.com/~roberto http://www.connexer.com
Attachment:
signature.asc
Description: Digital signature