Hi, On Mon, Jan 02, 2017 at 09:48:17PM -0800, Nikolaus Rath wrote: > Hello, > > When reading up some discussions on gbp/dgit interoperability, several > people alluded to the theoretical possibility of using gbp with a > patches-applied master branch. > > Is this officially supported? If so, how do I use it?
I've not used it this way for some time now but nothing would prevent gbp build-package, import-orig, dch, clone and pull with a pathed tree. You might want to use -single-debian-patch --auto-commit with dpkg-source (or debian/source/options) in this case though to not have to do the sync between debian/patches and your source tree by hand [1]. For import-orig you want to make sure that --merge-mode is *merge* not *replace* to make sure you don't undo the changes when importing new upstream versions. This is currently the default but this will change for 3.0 (quilt) in the near future. import-dsc is currently only capable of creating an unpatched tree but that would be easily fixable. It might make sense to change the tag-format to from debian/%(version)s to s.th. like debian/patched/%(version)s since most people would expect an unpatched tree at debian/%(version).s Cheers -- Guido [1] https://lists.debian.org/debian-devel/2015/07/msg00691.html and other mails in this thread > > The number one thing that has always stopped me from using gbp is having > to study diffs of diffs when comparing two debian/nnn tags. > > Best, > -Nikolaus > > -- > GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F > Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F > > »Time flies like an arrow, fruit flies like a Banana.« > _______________________________________________ > git-buildpackage mailing list > git-buildpackage@lists.sigxcpu.org > http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage _______________________________________________ git-buildpackage mailing list git-buildpackage@lists.sigxcpu.org http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage