Mercurial > hg
view tests/test-rollback @ 7397:4c92d8971809
More verbose logging when filemerge searches for merge-tool
Previously it was very hard to find out what was going on when the expected
merge tool wasn't used. This patch tries to improve that.
hg merge -v now shows which tools were searched for but not found.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Fri, 07 Nov 2008 02:47:12 +0100 |
parents | 88b4d726332a |
children | 720f70b720d3 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg add a hg commit -m "test" -d "1000000 0" hg verify hg parents hg status hg rollback hg verify hg parents hg status echo % Test issue 902 hg commit -m "test" hg branch test hg rollback hg branch echo % Test rollback of hg before issue 902 was fixed hg commit -m "test" hg branch test rm .hg/undo.branch hg rollback hg branch