On 09/26/2010 07:57 PM, Gregory Jefferis wrote:
I would like to have another go at fixing this bad interaction between track
changes and version control systems. Basically means using a hash function
of author email (+/- name) rather than an integer starting at 1 to identify
the author of tracked changes. But I need a little help with practicalities
We're here to help. ;-)
1) I have a patch set for 1.6.X which will no longer apply because Vincent
(vfr) already contributed an alternative. I presume that I need to modify
my patch to layer on top of his.
The patch should have been (and would have to be) for trunk, because
this is a file format change.
Note that, if you have a patch that no longer applies, you can always do
this:
1. svn up -r xxxxx, where xxxxx is a version back when it worked
2. apply the patch
3. svn up
You'll now get conflicts, but you can resolve those.
Richard
