Okay, I think the patch below solves my problem. I've tried to write it so it works if filenames happen to have spaces in them.
Here are some observations: - According to http://bazaar-vcs.org/Usability?highlight=%28text+conflicts%29 there are also "logical conflicts." Since I don't know how bzr status displays them, I am not attempting to parse them. - "Text conflict" will now be hidden from the user in the bzr-status view. I'm not sure whether this is a problem. Patch follows: --- lisp/bzr.el 2007-05-24 17:57:44 +0000 +++ lisp/bzr.el 2007-06-05 21:31:08 +0000 @@ -406,7 +406,7 @@ (list 'file newname " " " " dir oldname))))) - ((looking-at " +\\([^\n]*?\\)\\([/@]\\)?$") + ((looking-at " +\\(?:Text conflict in \\)?\\([^\n]*?\\)\\([/@]\\)?$") (let ((file (match-string-no-properties 1)) (dir (match-string-no-properties 2))) (with-current-buffer changes-buffer _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
