Masatake YAMATO <[EMAIL PROTECTED]> writes: > Thank you. Now I can generate conflicts repeatedly. > My idea is that *arch-process* buffer created by star-merge should have its > own mode:
I think the *arch-process* buffer should be parsed, and the result should be displayed by ewoc. Actually, Most of the job is already done in `tla-show-changes-buffer'. You mostly need to call this function, and add a bit of code to tla-changes-mode. > Is this difficult in arch? You have two way to show conflicts: .rej files, and inline markers (for three way merges). It's very easy to locate them for .rej files (test the existance of the file), and very costly to locate them for inline markers : You will need to parse the whole file. The other option is to keep a list of conflicting files after an update or star-merge. I think this is more or less what PCL-CVS does. But it won't help you if you "tla star-merge" from the command line and then try to "M-x tla-inventory RET" from within Emacs ... -- Matthieu
