Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4 @ 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 | e506c14382fd |
children |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "1000000 0" hg merge 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "1000000 0"