# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1219398810 -7200
# Node ID a6f4e13679784e3a8fe8df2ffb41799a3ddb48d7
# Parent  ad766066d1bc6beeda5e1905e88f014cae539095
(0.9.2compat) add merge, resolve to restricted

This is not really backwards compatible (test only as comment)
and doesn't prevent extra conflicts with older Hg versions.
On the other hand it doesn't do any damage either and provides
the 3-way merge ease if possible.

diff -r ad766066d1bc -r a6f4e1367978 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Aug 21 19:07:33 2008 +0200
+++ b/hgkw/keyword.py	Fri Aug 22 11:53:30 2008 +0200
@@ -100,7 +100,7 @@
 
 # hg commands that trigger expansion only when writing to working dir,
 # not when reading filelog, and unexpand when reading from working dir
-restricted = 'record qfold qimport qnew qpush qrefresh qrecord'
+restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord'
 
 def utcdate(date):
     '''Returns hgdate in cvs-like UTC format.'''
diff -r ad766066d1bc -r a6f4e1367978 tests/test-keyword
--- a/tests/test-keyword	Thu Aug 21 19:07:33 2008 +0200
+++ b/tests/test-keyword	Fri Aug 22 11:53:30 2008 +0200
@@ -285,6 +285,31 @@
 #echo % errors encountered
 #cat errors.log
 
+#echo % merge/resolve
+#echo '$Id$' > m
+#hg add m
+#hg commit -m 4kw 
+#echo foo >> m
+#hg commit -m 5foo
+#echo % simplemerge
+#hg update 4
+#echo foo >> m
+#hg commit -m 6foo
+#hg merge
+#hg commit -m simplemerge
+#cat m
+#echo % conflict
+#hg update 4
+#echo bar >> m
+#hg commit -m 8bar
+#hg merge
+#echo % keyword stays outside conflict zone
+#cat m
+#echo % resolve to local
+#HGMERGE=internal:local hg resolve
+#hg commit -m localresolve
+#cat m
+
 echo % switch off expansion
 echo % kwshrink with unknown file u
 cp a u