Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 22:32:53 +0200] rev 6935
Have verbose and debug flag print the changeset rev and hash when committing.
Besides updating the tests output, I had to push back at the end the test for
issue1193 in test-commit, solved by cset 4386a7706828, because it was using the
current date for commit and was randomizing the subsequent hash.
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 22:13:39 +0200] rev 6934
Backed out changeset d557749c627a
Replace this change with a better one.
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 08:26:18 +0200] rev 6933
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.
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 13:25:35 +0200] rev 6932
Have verbose flag print the changeset hash when committing
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 19:24:47 +0200] rev 6931
test-rebase-mq: '|' is a GNU sed extension, unfold it
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Aug 2008 19:05:18 +0200] rev 6930
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Aug 2008 19:02:56 +0200] rev 6929
bisect: status message when no action is specified