Show More
@@ -1,25 +1,25 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | HGRCPATH=$HGTMP/.hgrc; export HGRCPATH |
|
3 | HGRCPATH=$HGTMP/.hgrc; export HGRCPATH | |
4 | echo "[extensions]" >> $HGTMP/.hgrc |
|
4 | echo "[extensions]" >> $HGTMP/.hgrc | |
5 | echo "fetch=" >> $HGTMP/.hgrc |
|
5 | echo "fetch=" >> $HGTMP/.hgrc | |
6 |
|
6 | |||
7 | hg init a |
|
7 | hg init a | |
8 | echo a > a/a |
|
8 | echo a > a/a | |
9 | hg --cwd a commit -d '1 0' -Ama |
|
9 | hg --cwd a commit -d '1 0' -Ama | |
10 |
|
10 | |||
11 | hg clone a b |
|
11 | hg clone a b | |
12 | hg clone a c |
|
12 | hg clone a c | |
13 |
|
13 | |||
14 | echo b > a/b |
|
14 | echo b > a/b | |
15 | hg --cwd a commit -d '2 0' -Amb |
|
15 | hg --cwd a commit -d '2 0' -Amb | |
16 | hg --cwd a parents -q |
|
16 | hg --cwd a parents -q | |
17 |
|
17 | |||
18 | echo % should pull one change |
|
18 | echo % should pull one change | |
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 |
@@ -1,27 +1,27 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | adding b |
|
4 | adding b | |
5 | 1:97d72e5f12c7 |
|
5 | 1:97d72e5f12c7 | |
6 | % should pull one change |
|
6 | % should pull one change | |
7 | pulling from ../a |
|
7 | pulling from ../a | |
8 | searching for changes |
|
8 | searching for changes | |
9 | adding changesets |
|
9 | adding changesets | |
10 | adding manifests |
|
10 | adding manifests | |
11 | adding file changes |
|
11 | adding file changes | |
12 | added 1 changesets with 1 changes to 1 files |
|
12 | added 1 changesets with 1 changes to 1 files | |
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | 1:97d72e5f12c7 |
|
14 | 1:97d72e5f12c7 | |
15 | adding c |
|
15 | adding c | |
16 | pulling from ../a |
|
16 | pulling from ../a | |
17 | searching for changes |
|
17 | searching for changes | |
18 | adding changesets |
|
18 | adding changesets | |
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
21 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
22 | merging with new head 2:97d72e5f12c7 |
|
22 | merging with new head 2:97d72e5f12c7 | |
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 |
new changeset 3: |
|
24 | new changeset 3:cd3a41621cf0 merges remote changes with local | |
25 | a |
|
25 | a | |
26 | b |
|
26 | b | |
27 | c |
|
27 | c |
General Comments 0
You need to be logged in to leave comments.
Login now