equal
deleted
inserted
replaced
22 hg --cwd c commit -d '3 0' -Amc |
22 hg --cwd c commit -d '3 0' -Amc |
23 |
23 |
24 hg clone c d |
24 hg clone c d |
25 hg clone c e |
25 hg clone c e |
26 |
26 |
|
27 # We cannot use the default commit message if fetching from a local |
|
28 # repo, because the path of the repo will be included in the commit |
|
29 # message, making every commit appear different. |
|
30 |
27 echo % should merge c into a |
31 echo % should merge c into a |
28 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a |
32 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a |
29 ls c |
33 ls c |
30 |
34 |
31 hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid |
35 hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid |
47 |
51 |
48 echo g > g/g |
52 echo g > g/g |
49 hg --cwd g ci -d '6 0' -Amg |
53 hg --cwd g ci -d '6 0' -Amg |
50 |
54 |
51 echo % should merge f into g |
55 echo % should merge f into g |
52 hg --cwd g fetch --switch ../f |
56 hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f |