Fixing Bitrot, the Bzr Way
Bill Barry
after.fallout at gmail.com
Thu May 13 16:10:32 UTC 2010
Is there any standard place where we could fork the bzr repo and then
present pull requests with our patches (I don't have any right now, but
perhaps someday). Or are we still supposed to put the patches up on
bugzilla and let you apply them after review?
Max Kanat-Alexander wrote:
> 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
More information about the developers
mailing list