On 2017-08-09 17:34, Hauke Fath wrote:
I nave been banging a bit on vc-fossil.el from
and got it to work with Xemacses ~slightly-older vc.
Getting back to this, I have added vc-fossil-merge-news, which appears
to work fine(*) until it attempts to deal with merge conflicts.
Looking at vc.el's vc-resolve-conflicts, it turns out that the function
has a very narrow view of conflict markers, which surprisingly not even
subversion (much less Fossil) complies with. And from what I can see,
there is no way of overriding these strings per-vcs. I guess this is
XEmacsens vc showing its age.
What would be the best way forward?
(*) The need to repeatedly search the *vc* buffer and re-wind the
pointer makes the code a bit ugly. Is there an
always-search-from-beginning-of-buffer function, or would I have to
build that myself?
The ASCII Ribbon Campaign Hauke Fath
() No HTML/RTF in email Institut für Nachrichtentechnik
/\ No Word docs in email TU Darmstadt
Respect for open standards Ruf +49-6151-16-21344