Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-default @ 3572:fe03c9a476f6
log speedup: use only ui.write in changeset_printer.show
- ui.status is not very useful, since this code is never
executed when ui.quiet is true.
- explicitly checking for ui.debug allows a regular hg log to
run without looking at the manifest index
- the calls to ui.note were converted for consistency
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 28 Oct 2006 20:21:54 -0300 |
parents | 013921c753bd |
children | 9cd6578750b9 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg commit -A -ma echo a >> a hg commit -mb echo a >> a hg commit -mc hg up 1 echo a >> a hg commit -md hg up 1 echo a >> a hg commit -me hg up 1 echo % should fail because not at a head hg merge hg up echo % should fail because \> 2 heads hg merge echo % should succeed hg merge 2 hg commit -mm1 echo % should succeed - 2 heads hg merge hg commit -mm2 echo % should fail because 1 head hg merge true