[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#10709: Feature request: vc-hg should activate smerge-mode for confli
From: |
Stefan Monnier |
Subject: |
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts |
Date: |
Mon, 06 Feb 2012 08:27:27 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) |
>> So you're saying that hg uses standard conflict markers in its
>> internal:merge code? Wonderful.
> I've just double-checked: yes, it does. Here's an example of a file
> with conflicts:
> <<<<<<< local
> foo = baz
> =======
> foo = qux
>>>>>>>> other
> This matches the markers defined in smerge-mode, and invoking
> smerge-mode manually on the example file works just fine, just as I
> remembered.
>> >> Actually I guess vc-hg would need some changes too.
>> > Yep, I guess you'd need changes on both ends.
>>
>> Apparently only vc-hg.el needs to be changed, then.
> Yup, this brings me back to my original chain of thought: vc-hg needs
> to learn to detect conflicted files, and the vc-find-file-hook needs
> to be ported/abstracted from vc-svn.
You can also check vc-bzr.el which has similar code.
Stefan
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts, Stefan Monnier, 2012/02/03