On 07/12/2011 10:52 AM, Julian Foad wrote: > Note that there are other possible ways of working, which can be tried > as well as or instead of the branch. An external script is another good > option, like the way 'svnmerge.py' existed before the current built-in > merge tracking. I was talking to Andy the other day and I got the > strong impression that his focus (and the reason he mentioned an > "extensible" data format and some implementation details such as using a > file rather than a property) was specifically to encourage > experimentation and extension and participation, including by people who > might not normally work in the core C code.
I almost suggested a script as a form of prototype earlier in the thread, but got derailed by my concerns that, again, only the most superficial of merge problems could be reasonably, performantly solved by a wrapper script. Still, it's a fine approach if it fits the plan of action. -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Distributed Development On Demand
signature.asc
Description: OpenPGP digital signature