Henrik Nordstrom wrote:
On Mon, 2008-03-10 at 15:32 +1300, Amos Jeffries wrote:
Is there a nice easy way in bzr of retrieving the -r # (of the
ancestor!) when the branch was last 'branched'/updated off its ancestor?
suitable for a bzr revert -r # ./Makefile.in (and others)
-r submit: should work I think.
That works perfectly. Here is the bzrcleanpatch script I'm using...
For now it just cleans the branch of new additions to the auto-tools
files and submits to squid-dev for bundebuggy to manage the rest.
I've tested this running bootstrap.sh and the resulting configure.
It cleanly removes any changes to the versioned auto-tools files and
creates a patch of the actual code changes. Can either submit to
squid-dev (default) or given a name creates a <name>.patch file of
alterations for applying manually.
Amos
--
Please use Squid 2.6STABLE17+ or 3.0STABLE1+
There are serious security advisories out on all earlier releases.
#!/bin/bash
#
#
echo " Omitting auto-generated files ... "
bzr revert -r submit: {,*/,*/*/,*/*/*/,*/*/*/*/}Makefile.in aclocal.m4 cfgaux/*
configure || exit 1
echo ""
echo " Omitting alterations to Third-Party configurations ..."
bzr revert -r submit: lib/*/aclocal.m4 lib/*/configure lib/*/cfgaux/* || exit 1
echo ""
echo " Patch Status: ..."
bzr status || exit 1
echo ""
if [ "${1}" != "" ]; then
echo " Generating PATCH file ${1}.patch ..."
bzr diff -r submit: >./${1}.patch
echo ""
else
# Generate patch and send to squid-dev.
echo " Generating and submitting MERGE patch for squid-dev ..."
bzr send [EMAIL PROTECTED]
fi
