|
1 |
|
2 $ cat >> $HGRCPATH <<EOF |
|
3 > [defaults] |
|
4 > amend=-d "0 0" |
|
5 > [experimental] |
|
6 > obsmarkers-exchange-debug=true |
|
7 > bundle2-exp=true |
|
8 > [ui] |
|
9 > ssh=python "$RUNTESTDIR/dummyssh" |
|
10 > [phases] |
|
11 > publish = False |
|
12 > [extensions] |
|
13 > EOF |
|
14 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
|
15 |
|
16 $ mkcommit() { |
|
17 > echo "$1" > "$1" |
|
18 > hg add "$1" |
|
19 > hg ci -m "add $1" |
|
20 > } |
|
21 |
|
22 setup repo |
|
23 |
|
24 $ hg init server |
|
25 |
|
26 $ hg clone ssh://user@dummy/server client |
|
27 no changes found |
|
28 updating to branch default |
|
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
30 $ cp -r client other |
|
31 |
|
32 Smoke testing |
|
33 =============== |
|
34 |
|
35 $ cd client |
|
36 $ mkcommit 0 |
|
37 $ mkcommit a |
|
38 $ hg push |
|
39 pushing to ssh://user@dummy/server |
|
40 searching for changes |
|
41 remote: adding changesets |
|
42 remote: adding manifests |
|
43 remote: adding file changes |
|
44 remote: added 2 changesets with 2 changes to 2 files |
|
45 $ hg pull |
|
46 pulling from ssh://user@dummy/server |
|
47 searching for changes |
|
48 no changes found |
|
49 $ hg pull -R ../other |
|
50 pulling from ssh://user@dummy/server |
|
51 requesting all changes |
|
52 adding changesets |
|
53 adding manifests |
|
54 adding file changes |
|
55 added 2 changesets with 2 changes to 2 files |
|
56 (run 'hg update' to get a working copy) |
|
57 $ hg push -R ../other |
|
58 pushing to ssh://user@dummy/server |
|
59 searching for changes |
|
60 no changes found |
|
61 [1] |
|
62 |
|
63 Push |
|
64 ============= |
|
65 |
|
66 $ echo 'A' > a |
|
67 $ hg amend |
|
68 $ hg push |
|
69 pushing to ssh://user@dummy/server |
|
70 searching for changes |
|
71 remote: adding changesets |
|
72 remote: adding manifests |
|
73 remote: adding file changes |
|
74 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
75 remote: obsmarker-exchange: 139 bytes received |
|
76 remote: 2 new obsolescence markers |
|
77 $ hg push |
|
78 pushing to ssh://user@dummy/server |
|
79 searching for changes |
|
80 no changes found |
|
81 [1] |
|
82 |
|
83 Pull |
|
84 ============= |
|
85 |
|
86 $ hg -R ../other pull |
|
87 pulling from ssh://user@dummy/server |
|
88 searching for changes |
|
89 adding changesets |
|
90 adding manifests |
|
91 adding file changes |
|
92 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
|
93 obsmarker-exchange: 139 bytes received |
|
94 2 new obsolescence markers |
|
95 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
96 $ hg -R ../other pull |
|
97 pulling from ssh://user@dummy/server |
|
98 searching for changes |
|
99 no changes found |
|
100 |
|
101 Test some markers discovery |
|
102 =========================== |
|
103 |
|
104 $ echo c > C |
|
105 $ hg add C |
|
106 $ hg commit -m C |
|
107 $ echo c >> C |
|
108 $ hg amend |
|
109 $ hg push |
|
110 pushing to ssh://user@dummy/server |
|
111 searching for changes |
|
112 remote: adding changesets |
|
113 remote: adding manifests |
|
114 remote: adding file changes |
|
115 remote: added 1 changesets with 1 changes to 1 files |
|
116 remote: obsmarker-exchange: 139 bytes received |
|
117 remote: 2 new obsolescence markers |
|
118 $ hg -R ../other pull |
|
119 pulling from ssh://user@dummy/server |
|
120 searching for changes |
|
121 adding changesets |
|
122 adding manifests |
|
123 adding file changes |
|
124 added 1 changesets with 1 changes to 1 files |
|
125 obsmarker-exchange: 139 bytes received |
|
126 2 new obsolescence markers |
|
127 (run 'hg update' to get a working copy) |
|
128 |
|
129 some common hidden |
|
130 |
|
131 $ hg touch . |
|
132 $ hg push |
|
133 pushing to ssh://user@dummy/server |
|
134 searching for changes |
|
135 remote: adding changesets |
|
136 remote: adding manifests |
|
137 remote: adding file changes |
|
138 remote: added 1 changesets with 0 changes to 1 files (+1 heads) |
|
139 remote: obsmarker-exchange: 208 bytes received |
|
140 remote: 1 new obsolescence markers |
|
141 $ hg -R ../other pull |
|
142 pulling from ssh://user@dummy/server |
|
143 searching for changes |
|
144 adding changesets |
|
145 adding manifests |
|
146 adding file changes |
|
147 added 1 changesets with 0 changes to 1 files (+1 heads) |
|
148 obsmarker-exchange: 208 bytes received |
|
149 1 new obsolescence markers |
|
150 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
151 |
|
152 $ cd .. |