Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-excessive-merge @ 1770:4eea6a747c27
hgmerge: fix diff+patch detection; cleanups
Details:
- actually show help message when no tools are found
- whitespace cleanup (stupid emacs)
- quote more variables
- simplify merge/diff3 error handling
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Tue, 21 Feb 2006 15:48:09 -0600 |
parents | ef8cd889a78b |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo foo > a echo foo > b hg add a b hg ci -m "test" -d "0 0" echo blah > a hg ci -m "branch a" -d "0 0" hg co 0 echo blah > b hg ci -m "branch b" -d "0 0" HGMERGE=true hg up -m 1 hg ci -m "merge b/a -> blah" -d "0 0" hg co 1 HGMERGE=true hg up -m 2 hg ci -m "merge a/b -> blah" -d "0 0" hg log hg debugindex .hg/00changelog.i echo echo 1 hg manifest 1 echo 2 hg manifest 2 echo 3 hg manifest 3 echo 4 hg manifest 4 echo hg debugindex .hg/data/a.i hg verify