Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/README @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 14 May 2006 21:07:34 -0700 |
parents | 8a2a7f7d9df6 |
children | 1c66aad252f9 |
comparison
equal
deleted
inserted
replaced
2282:2efa636eb411 | 2283:e506c14382fd |
---|---|
14 test-<x>.err. | 14 test-<x>.err. |
15 | 15 |
16 There are some tricky points here that you should be aware of when | 16 There are some tricky points here that you should be aware of when |
17 writing tests: | 17 writing tests: |
18 | 18 |
19 - hg commit and hg up -m want user interaction | 19 - hg commit and hg merge want user interaction |
20 | 20 |
21 for commit use -m "text" | 21 for commit use -m "text" |
22 for hg up -m, set HGMERGE to something noninteractive (like true or merge) | 22 for hg merge, set HGMERGE to something noninteractive (like true or merge) |
23 | 23 |
24 - changeset hashes will change based on user and date which make | 24 - changeset hashes will change based on user and date which make |
25 things like hg history output change | 25 things like hg history output change |
26 | 26 |
27 use commit -m "test" -u test -d "1000000 0" | 27 use commit -m "test" -u test -d "1000000 0" |