Public bug reported: Since most of the patches were generated on earlier source trees, there are often slight line offsets when applying. Patch can deal with this, but potentially things can break later. By keeping the patches up-to date for each source version, we can keep an eye on this and prevent problems - i.e., patches won't go stale. This process can be easily handled using Quilt.
Pushed ourdelta branch with a patch list file adapted for Quilt) to lp :~arjen-lentz/ourdelta/ourdelta-quilt cd ~ bzr branch lp:~arjen-lentz/ourdelta/ourdelta-quilt ourdelta-quilt tar zxpf mysql-5.0.67.tar.gz export QUILT_PATCHES=~/ourdelta-quilt/mysql/5.0/ cd mysql-5.0.67 quilt setup ~/ourdelta-quilt/mysql/5.0/patches-build-ourdelta Now you can 'quilt push' to add one patch at a time Use 'quilt refresh' to create a new diff for the patch at the top of the patch stack (diffed from the current tree) Then when you do 'bzr diff' in the bzr tree, you will see how the patch has changed. Verify, when ok commit. Separate commit for each patch please. push your tree onto lp (bzr push lp:~yourname/ourdelta/ourdelta-quilt-yourname) and propose for merging into arjen's quilt branch. Extra notes: - man quilt - quilt push/pop -a applies or de-applies all patches rather than one at a time. - http://www.suse.de/~agruen/quilt.pdf provides a good overview of how Quilt works. ** Affects: ourdelta Importance: High Status: Confirmed ** Affects: ourdelta/trunk Importance: High Status: Confirmed ** Changed in: ourdelta Importance: Undecided => High Status: New => Confirmed -- Check patch line offsets with Quilt https://bugs.launchpad.net/bugs/285721 You received this bug notification because you are a member of OurDelta- developers, which is the registrant for OurDelta. Status in OurDelta - Builds for MySQL: Confirmed Status in OurDelta Series: trunk: Confirmed Bug description: Since most of the patches were generated on earlier source trees, there are often slight line offsets when applying. Patch can deal with this, but potentially things can break later. By keeping the patches up-to date for each source version, we can keep an eye on this and prevent problems - i.e., patches won't go stale. This process can be easily handled using Quilt. Pushed ourdelta branch with a patch list file adapted for Quilt) to lp:~arjen-lentz/ourdelta/ourdelta-quilt cd ~ bzr branch lp:~arjen-lentz/ourdelta/ourdelta-quilt ourdelta-quilt tar zxpf mysql-5.0.67.tar.gz export QUILT_PATCHES=~/ourdelta-quilt/mysql/5.0/ cd mysql-5.0.67 quilt setup ~/ourdelta-quilt/mysql/5.0/patches-build-ourdelta Now you can 'quilt push' to add one patch at a time Use 'quilt refresh' to create a new diff for the patch at the top of the patch stack (diffed from the current tree) Then when you do 'bzr diff' in the bzr tree, you will see how the patch has changed. Verify, when ok commit. Separate commit for each patch please. push your tree onto lp (bzr push lp:~yourname/ourdelta/ourdelta-quilt-yourname) and propose for merging into arjen's quilt branch. Extra notes: - man quilt - quilt push/pop -a applies or de-applies all patches rather than one at a time. - http://www.suse.de/~agruen/quilt.pdf provides a good overview of how Quilt works. _______________________________________________ Mailing list: https://launchpad.net/~ourdelta-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~ourdelta-developers More help : https://help.launchpad.net/ListHelp
