Ferenc Wagner <wf...@niif.hu> writes: > It looks like our squeeze branch misses the merge of bug/unlink-pidfile. > Nor was upstream/2.3.1+dfsg merged into that bugfix branch... As things > stand, our master branch has the fix (e3f9f278) but our debian branch > does not, so when I branched squeeze off it the fix got lost. I'm a > little uncertain how to untagle this...
I think my bright idea of the separate debian branch turns out to be way more confusing than it's worth, so I propose dropping that distinction going forward and merging the debian branch into master, then making Debian-specific changes only in master. Having separate branches for bug fixes and features that we want to push upstream makes sense, but the distinction between debian and master was never clear and makes it too likely that we'll run into problems like this. -- Russ Allbery (r...@debian.org) <http://www.eyrie.org/~eagle/> -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
