Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-push-warn @ 838:0fc4b1ab57e3
Merge with Matt.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 04 Aug 2005 05:14:59 -0800 |
parents | 8674b7803714 |
children | 9c918287d10b |
comparison
equal
deleted
inserted
replaced
837:a95c9b3fc3bf | 838:0fc4b1ab57e3 |
---|---|
1 #!/bin/sh | |
2 | |
3 mkdir a | |
4 cd a | |
5 hg init | |
6 echo foo > t1 | |
7 hg add t1 | |
8 hg commit -m "1" -d "0 0" | |
9 | |
10 cd .. | |
11 hg clone a b | |
12 | |
13 cd a | |
14 echo foo > t2 | |
15 hg add t2 | |
16 hg commit -m "2" -d "0 0" | |
17 | |
18 cd ../b | |
19 echo foo > t3 | |
20 hg add t3 | |
21 hg commit -m "3" -d "0 0" | |
22 | |
23 hg push ../a | |
24 hg pull ../a | |
25 hg push ../a | |
26 hg up -m | |
27 hg commit -m "4" -d "0 0" | |
28 hg push ../a |