On Tue, Jan 14, 2014 at 04:51:20PM +0100, Olivier Berger wrote: > Now, if you both want to track upstream sources from origin/master on > local upstream/ branch and svn's trunk on local master branch, then, > yes, a debian/gbp.conf comes handy, and you'll have to do nasty merges > now and then.
git import-orig --filter=debian helps to avoid nasty merges, as long as you don't make changes to the upstream sources directly inside your packaging branch -- there shall be no conflicts if upstream does not touch debian and you do not touch the upstream sources. gbp-pq is also wonderful for maintaining quilt patch series. -- Kind regards, Loong Jin
signature.asc
Description: Digital signature
