Mercurial > evolve
comparison tests/test-fold.t @ 5961:dad6bd8180d3
tests: use mkcommit() from common.sh in test-fold.t
Notice the -q flag to hg ci.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 17 Jun 2021 10:57:53 +0300 |
| parents | a1dad44fe3da |
| children | 65d4e47d7f26 |
comparison
equal
deleted
inserted
replaced
| 5960:d919851981d4 | 5961:dad6bd8180d3 |
|---|---|
| 9 > glog = log -GT "{rev}: {desc}" | 9 > glog = log -GT "{rev}: {desc}" |
| 10 > glf = log -GT "{rev}: {desc} ({files})" | 10 > glf = log -GT "{rev}: {desc} ({files})" |
| 11 > [ui] | 11 > [ui] |
| 12 > logtemplate = '{rev} - {node|short} {desc|firstline} [{author}] ({phase}) {bookmarks}\n' | 12 > logtemplate = '{rev} - {node|short} {desc|firstline} [{author}] ({phase}) {bookmarks}\n' |
| 13 > EOF | 13 > EOF |
| 14 $ mkcommit() { | |
| 15 > echo "$1" > "$1" | |
| 16 > hg add "$1" | |
| 17 > hg ci -qm "$1" | |
| 18 > } | |
| 19 | 14 |
| 20 $ hg init fold-tests | 15 $ hg init fold-tests |
| 21 $ cd fold-tests/ | 16 $ cd fold-tests/ |
| 22 $ hg debugbuilddag .+3:branchpoint+4*branchpoint+2 | 17 $ hg debugbuilddag .+3:branchpoint+4*branchpoint+2 |
| 23 $ hg up 'desc("r7")' | 18 $ hg up 'desc("r7")' |
| 317 $ mkcommit zebra | 312 $ mkcommit zebra |
| 318 | 313 |
| 319 $ hg up null | 314 $ hg up null |
| 320 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 315 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 321 $ mkcommit apple | 316 $ mkcommit apple |
| 317 created new head | |
| 322 $ mkcommit banana | 318 $ mkcommit banana |
| 323 | 319 |
| 324 $ hg merge | 320 $ hg merge |
| 325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 321 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 326 (branch merge, don't forget to commit) | 322 (branch merge, don't forget to commit) |