Fixing Bitrot, the Bzr Way

[Max Kanat-Alexander]

	So, if you have a patch that's bitrotted, but you'd like to take 
advantage of bzr's excellent merge algorithms instead of trying to 
un-bitrot everything yourself, there is a way:

	1. cd /path/to/your/bugzilla/dev/directory
	2. bzr branch -rdate:'2010-01-01 12:13:14' . fix/
	   (Where "2010-01-01 12:13:14" is the date you originally wrote your 
patch.)
	3. cd fix/
	4. Apply your patch (which should apply perfectly, since this should be 
the exact code you wrote it against)
	5. bzr commit -m blah
	6. cd ../
	7. bzr merge fix/
	8. rm -rf fix/

	And now if there are conflicts, you'll get the minimum possible 
conflicts, as determined by bzr!

	-Max
-- 
http://www.everythingsolved.com/
Competent, Friendly Bugzilla and Perl Services. Everything Else, too.