[PATCH] keyword: avoid additional conflicts during merge/resolve

[Christian Ebert]

* Christian Ebert on Friday, August 22, 2008 at 08:27:04 +0200
> # HG changeset patch
> # User Christian Ebert <blacktrash at gmx.net>
> # Date 1219386378 -7200
> # Node ID 1b311c57e5ce027107bfde179f9504cabca65319
> # Parent  a58a611c320fc763bb2dac5b3e468bad4c270629
> keyword: avoid additional conflicts during merge/resolve
> 
> Make merge and resolve trigger kwtemplater.restricted to compare
> data without keyword expansion.
> The keyword stays outside the conflict:
> 
> $Keyword$
> <<<<<<< local
> bar
> =======
> foo
>>>>>>>> other
> 
> and will again be expanded on commit.
> Demonstrate in test case.

btw, this was made possible in principle by the refactoring of
status in bf2bf986ff87 and finally the fix thereof in
0697e7818d07. -- Not that I really understand why, but bisecting
shows it ;)

c
-- 
  Was heißt hier Dogma, ich bin Underdogma!
[ What the hell do you mean dogma, I am underdogma. ]

_F R E E_  _V I D E O S_  -->>  http://www.blacktrash.org/underdogma/