diff -r f5d89f804e6f -r 6f276a923989 tests/test-keyword.t --- a/tests/test-keyword.t Mon Jan 07 02:00:43 2013 +0100 +++ b/tests/test-keyword.t Mon Jan 07 17:23:25 2013 +0100 @@ -747,7 +747,9 @@ Commit with multi-line message and custom expansion $ hg --debug commit -l log -d '2 0' -u 'User Name ' + invalid branchheads cache: tip differs a + invalid branchheads cache: tip differs overwriting a expanding keywords committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 $ rm log @@ -789,6 +791,8 @@ $ hg debugrebuildstate $ hg remove a $ hg --debug commit -m rma + invalid branchheads cache: tip differs + invalid branchheads cache: tip differs committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 $ hg status ? c @@ -899,8 +903,10 @@ [255] $ cd x $ hg --debug commit -m xa -d '3 0' -u 'User Name ' + invalid branchheads cache: tip differs x/a x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e + invalid branchheads cache: tip differs overwriting x/a expanding keywords committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 $ cat a