Comment 10 for bug 929164

20:34 < SpamapS> where exactly can I set this 'quilt-commit-policy' ?
20:34 < SpamapS> There's no docs for it..
20:34 * SpamapS should perhaps ask jelmer
20:34 < SpamapS> jelmer: here?
20:34 -!- torkel [<email address hidden>] has joined #ubuntu-devel
20:34 < barry> SpamapS: yeah, i did find them, but i forget where
20:34 < barry> you add them to debian/bzr-builddeb.conf which is an ini file iirc
20:35 < jelmer> SpamapS: hi
20:35 < SpamapS> jelmer: I'm trying to figure out how to set the quilt-commit-policy = applied
20:35 < barry> hi jelmer! more data on bug 929164
20:35 < ubottu> Launchpad bug 929164 in Ubuntu Distributed Development "Build problem after `bzr merge`ing source packages" [Undecided,Confirmed] https://launchpad.net/bugs/929164
20:37 < SpamapS> seems to me that the policy should be inferred from debian/source/format , shouldn't it?
20:37 -!- ia [~ia@89.169.161.244] has joined #ubuntu-devel
20:37 -!- asac [~asac@conference/linaro-connect/x-kuimhjzxbdouyzwb] has joined #ubuntu-devel
20:37 -!- asac [~asac@conference/linaro-connect/x-kuimhjzxbdouyzwb] has quit [Changing host]
20:37 -!- asac [~asac@debian/developer/asac] has joined #ubuntu-devel
20:38 < jelmer> SpamapS: what are you trying to do exactly?
20:38 < jelmer> SpamapS: quilt-commit-policy by default is disabled
20:39 -!- amorphous [~<email address hidden>] has joined #ubuntu-devel
20:39 -!- amorphous [~<email address hidden>] has left #ubuntu-devel []
20:39 < SpamapS> jelmer: I want patches applied to a branch when I commit
20:40 < jelmer> SpamapS: ah, ok - in that case you want 'echo [BUILDDEB]\nquilt-commit-policy = applied\n' > debian/bzr-builddeb.conf
20:40 < SpamapS> jelmer: mostly for the greater purpose of testing why merging lp:debian/cyrus-sasl2 into lp:ubuntu/cyrus-sasl2 ends up deleting the entire .pc directory
20:41 < jelmer> SpamapS: that would probably be because the smart quilt merging kicks in - it unapplies patches during the merge
20:41 -!- dupondje [~<email address hidden>] has joined #ubuntu-devel
20:42 < barry> SpamapS here's where jelmer describes configuration: http://article.gmane.org/gmane.linux.ubuntu.devel/34747
20:43 < barry> jelmer: and when there's conflicts the patches don't get applied because the process stops, which makes sense
20:43 < dupondje> Somebody here around with some gdebi/apt knowledge? Got a weird issue with a package, depends are mysql-client-5.1 | mysql-client, but get the following error on install (gdebi: http://paste.ubuntu.com/840803/ or apt
                  http://paste.ubuntu.com/840800/ )
20:43 -!- malkauns [~neil@67.115.118.49] has quit [Read error: Connection reset by peer]
20:43 -!- victorp [~victorp@02dc7c4e.bb.sky.com] has quit [Quit: Ex-Chat]
20:44 -!- malkauns [~neil@67.115.118.49] has joined #ubuntu-devel
20:44 < jelmer> SpamapS, barry: also http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/view/head:/doc/user_manual/configuration.rst
20:45 < barry> jelmer: thanks, i'll add a link to that from the packaging guide
20:45 -!- malkauns [~neil@67.115.118.49] has quit [Read error: Connection reset by peer]
20:46 -!- malkauns [~neil@67.115.118.49] has joined #ubuntu-devel
20:46 < SpamapS> ok so the unapply is fine, but how do I magically then tell the smart quilte merging to re-apply ?
20:46 -!- jsalisbury [~jsalisbur@66-189-92-216.dhcp.oxfr.ma.charter.com] has quit [Quit: Leaving]
20:47 -!- torkel [<email address hidden>] has quit [Quit: leaving]
20:48 < SpamapS> if I quilt push -a myself.. I have to then bzr add ..
20:48 -!- asac [~asac@debian/developer/asac] has quit [Ping timeout: 248 seconds]
20:48 -!- naba [~<email address hidden>] has quit [Ping timeout: 245 seconds]
20:49 * SpamapS is so confused
20:50 -!- devfil [~dfiloni@ubuntu/member/devfil] has joined #ubuntu-devel
20:50 < lifeless> SpamapS: orly :P
20:50 -!- bmahe [~bmahe@fsf/member/bmahe] has joined #ubuntu-devel
20:51 -!- patrickmw [~patrickmw@71-223-150-226.phnx.qwest.net] has quit [Remote host closed the connection]
20:51 < SpamapS> Ok, so doing bzr merge deb ubuntu, then resolving the conflicts, then doing 'bzr rm', then 'quilt push -a', then 'bzr add', then debcommit .. that worked
20:53 < jelmer> SpamapS: so, the issue seems to be that if there are conflicts during the patch applying we leave the tree as is
20:53 -!- malkauns [~neil@67.115.118.49] has quit [Read error: Connection reset by peer]
20:54 < barry> jelmer: could `bzr resolve` when there are no more conflicts clean everything up?
20:54 < SpamapS> to be clear, there were no conflicts during the _quilt_ patching, only during the bzr merge process
20:54 -!- malkauns [~neil@67.115.118.49] has joined #ubuntu-devel
20:54 < barry> SpamapS: after that last debcommit though, can you still `bzr bd -S` ?
20:54 -!- malkauns [~neil@67.115.118.49] has quit [Read error: Connection reset by peer]
20:55 < SpamapS> barry: yes!
20:55 -!- malkauns [~neil@67.115.118.48] has joined #ubuntu-devel
20:55 -!- negronjl [~<email address hidden>] has joined #ubuntu-devel
20:55 < barry> SpamapS: cool. failed for me, but let me try again with your recipe
20:55 < SpamapS> barry: both before and after the debcommit actually
20:55 < jelmer> barry: yeah, I guess we could have that apply the quilt patches. It might be a bit odd though
20:56 < SpamapS> jelmer: I'd be in support of that.. since that is the point at which the manual merge is over.
20:56 -!- malkauns [~neil@67.115.118.48] has quit [Read error: Connection reset by peer]
20:56 -!- malkauns [~neil@67.115.118.49] has joined #ubuntu-devel
20:56 < SpamapS> Even if it just reminded me to quilt push -a / bzr add .. :)
20:56 -!- porthose [~porthose@72-24-78-79.cpe.cableone.net] has joined #ubuntu-devel
20:56 -!- ivanka [~harvey@186-107-165-71.baf.movistar.cl] has quit [Quit: Leaving.]
20:56 < jelmer> SpamapS: ok, that's certainly possible
20:57 * jelmer pastes a bit of IRC conversation in the bug