Mercurial > hg
view tests/test-rollback @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 22:47:38 +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