<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hello Sébastien,<div class=""><br class=""><div><blockquote type="cite" class=""><div class="">BTW, the git repository of clisp packaging is rather complex with many</div><div class=""><div class="">different branches (even one branch per release recently), making the<br class="">git-buildpackage workflow uneasy.<br class=""></div></div></blockquote><div><br class=""></div><div>My workflow predates a lot of the tooling available now...</div><div><br class=""></div><div>I could not find another way of having ‘clean’ patches against upstream then by doing a ‘git rebase’ when a new upstream release comes out. So I have:</div><div><br class=""></div><div><br class=""></div><div>upstream v1-branch</div><div> |</div><div> \</div><div> ——> Debian v1-1 branch</div><div><br class=""></div><div><div>upstream v2-branch</div><div> |</div><div> \</div><div> ——> Debian v2-1 branch</div><div><br class=""></div><div>Where Debian v2-1 is Debian v1-1 rebased on top of upstream v2. This way it’s easy to backport changes and keep multiple versions alive.</div><div><br class=""></div></div><div>I’m currently looking at the ZFS packages and they use tags and master/upstream and I get all lost. For example, <a href="https://github.com/Fabian-Gruenbichler/zfs.git" class="">https://github.com/Fabian-Gruenbichler/zfs.git</a> debian/wip-0.7 branch has:</div><div><br class=""></div><div><blockquote type="cite" class=""><div>commit a94f106d4ff94e6b9117e1dbc11ac98883382ae1</div><div>Author: Brian Behlendorf <<a href="mailto:behlendorf1@llnl.gov" class="">behlendorf1@llnl.gov</a>></div><div>Date: Tue Aug 8 08:38:53 2017 -0700</div><div><br class=""></div><div> Fix dnode allocation race</div></blockquote></div><div><br class=""></div><div>While <a href="https://github.com/zfsonlinux/zfs.git" class="">https://github.com/zfsonlinux/zfs.git</a> master has:</div><div><br class=""></div><div><br class=""></div><div><div><blockquote type="cite" class=""><div>commit 9631681b75336ec6265d8fa5cecb353687c1f373</div><div>Author: Brian Behlendorf <<a href="mailto:behlendorf1@llnl.gov" class="">behlendorf1@llnl.gov</a>></div><div>Date: Tue Aug 8 08:38:53 2017 -0700</div><div><br class=""></div><div> Fix dnode allocation race</div></blockquote><br class=""></div><div>Notice that the commit ID is not the same, so I cannot even merge/pull/rebase. Color me very confused.</div></div><div><br class=""></div><div>However if there is an easier and more standard way of doing things I would be all in favour of using if, provided that there is documentation in the form of ‘execute these commands’ to </div><div><br class=""></div><div>- create a build</div><div>- create a new Debian release (go from -n to -n+1)</div><div>- integrate a new upstream release</div><div><br class=""></div><div><br class=""></div><div>Best regards, Peter</div><div><br class=""></div></div></div></body></html>