changeset 2812 | e0caea53c997 |
parent 2811 | 4f7abf341cd4 |
child 2976 | 61fcd9fac434 |
2811:4f7abf341cd4 | 2812:e0caea53c997 |
---|---|
19 hg --cwd b fetch ../a |
19 hg --cwd b fetch ../a |
20 hg --cwd b parents -q |
20 hg --cwd b parents -q |
21 |
21 |
22 echo c > c/c |
22 echo c > c/c |
23 hg --cwd c commit -d '3 0' -Amc |
23 hg --cwd c commit -d '3 0' -Amc |
24 hg --cwd c fetch ../a |
24 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a |
25 ls c |
25 ls c |