Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:02:02 +0200] rev 488
(stable) merge with default
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 13:25:35 +0200] rev 487
Have verbose flag print the changeset hash when committing
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 11:53:30 +0200] rev 486
(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.
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 08:26:18 +0200] rev 485
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.
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 21:32:06 +0200] rev 484
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 19:07:33 +0200] rev 483
(0.9.2compat) fix test compatibility
Comment out non-backwards compatible hgweb test (at default position).
Make kwexpand nonexistent work on Windows (originally by pmezard).
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 10:20:44 +0200] rev 482
Thorough hgweb testing
- test hgweb while keyword extension is _enabled_
- check expansion with hgweb.file
- besides log and diff, also check annotate for not expanding
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Aug 2008 11:20:34 +0200] rev 481
(stable) merge with default