Mercurial > hg
comparison tests/test-command-template @ 6723:1fe6f365df2e
merge: only in-branch merges can be implicit
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 23 Jun 2008 15:02:52 +0200 |
| parents | 9a9b02bcbcf4 |
| children | 9c8bbae02e9c |
comparison
equal
deleted
inserted
replaced
| 6722:197d54d82f8d | 6723:1fe6f365df2e |
|---|---|
| 21 hg commit -m 'new branch' -d '1400000 0' -u 'person' | 21 hg commit -m 'new branch' -d '1400000 0' -u 'person' |
| 22 hg co -q 3 | 22 hg co -q 3 |
| 23 echo other 4 >> d | 23 echo other 4 >> d |
| 24 hg add d | 24 hg add d |
| 25 hg commit -m 'new head' -d '1500000 0' -u 'person' | 25 hg commit -m 'new head' -d '1500000 0' -u 'person' |
| 26 hg merge -q | 26 hg merge -q foo |
| 27 hg commit -m 'merge' -d '1500001 0' -u 'person' | 27 hg commit -m 'merge' -d '1500001 0' -u 'person' |
| 28 # second branch starting at nullrev | 28 # second branch starting at nullrev |
| 29 hg update null | 29 hg update null |
| 30 echo second > second | 30 echo second > second |
| 31 hg add second | 31 hg add second |