|
1 |
|
2 $ cat >> $HGRCPATH <<EOF |
|
3 > [defaults] |
|
4 > amend=-d "0 0" |
|
5 > [ui] |
|
6 > ssh=python "$TESTDIR/dummyssh" |
|
7 > [phases] |
|
8 > publish = False |
|
9 > [extensions] |
|
10 > hgext.rebase= |
|
11 > EOF |
|
12 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
13 |
|
14 $ mkcommit() { |
|
15 > echo "$1" > "$1" |
|
16 > hg add "$1" |
|
17 > hg ci -m "add $1" |
|
18 > } |
|
19 |
|
20 setup repo |
|
21 |
|
22 $ hg init server |
|
23 |
|
24 $ hg clone ssh://user@dummy/server client |
|
25 no changes found |
|
26 OBSEXC: pull obsolescence markers |
|
27 OBSEXC: looking for common markers in 0 nodes |
|
28 OBSEXC: no unknown remote markers |
|
29 OBSEXC: DONE |
|
30 updating to branch default |
|
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 $ cp -r client other |
|
33 |
|
34 Smoke testing |
|
35 =============== |
|
36 |
|
37 $ cd client |
|
38 $ mkcommit 0 |
|
39 $ mkcommit a |
|
40 $ hg push |
|
41 pushing to ssh://user@dummy/server |
|
42 searching for changes |
|
43 remote: adding changesets |
|
44 remote: adding manifests |
|
45 remote: adding file changes |
|
46 remote: added 2 changesets with 2 changes to 2 files |
|
47 $ hg pull |
|
48 pulling from ssh://user@dummy/server |
|
49 searching for changes |
|
50 no changes found |
|
51 OBSEXC: pull obsolescence markers |
|
52 OBSEXC: looking for common markers in 2 nodes |
|
53 OBSEXC: no unknown remote markers |
|
54 OBSEXC: DONE |
|
55 $ hg pull -R ../other |
|
56 pulling from ssh://user@dummy/server |
|
57 requesting all changes |
|
58 adding changesets |
|
59 adding manifests |
|
60 adding file changes |
|
61 added 2 changesets with 2 changes to 2 files |
|
62 OBSEXC: pull obsolescence markers |
|
63 OBSEXC: looking for common markers in 2 nodes |
|
64 OBSEXC: no unknown remote markers |
|
65 OBSEXC: DONE |
|
66 (run 'hg update' to get a working copy) |
|
67 $ hg push -R ../other |
|
68 pushing to ssh://user@dummy/server |
|
69 searching for changes |
|
70 no changes found |
|
71 [1] |
|
72 |
|
73 Push |
|
74 ============= |
|
75 |
|
76 $ echo 'A' > a |
|
77 $ hg amend |
|
78 $ hg push |
|
79 pushing to ssh://user@dummy/server |
|
80 searching for changes |
|
81 OBSEXC: computing relevant nodes |
|
82 OBSEXC: looking for common markers in 2 nodes |
|
83 OBSEXC: computing markers relevant to 1 nodes |
|
84 OBSEXC: writing 2 markers |
|
85 OBSEXC: pushing 171 bytes |
|
86 OBSEXC: DONE |
|
87 remote: adding changesets |
|
88 remote: adding manifests |
|
89 remote: adding file changes |
|
90 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
91 $ hg push |
|
92 pushing to ssh://user@dummy/server |
|
93 searching for changes |
|
94 no changes found |
|
95 OBSEXC: computing relevant nodes |
|
96 OBSEXC: looking for common markers in [23] nodes (re) |
|
97 OBSEXC: markers already in sync |
|
98 OBSEXC: no marker to push |
|
99 OBSEXC: DONE |
|
100 [1] |
|
101 |
|
102 Pull |
|
103 ============= |
|
104 |
|
105 $ hg -R ../other pull |
|
106 pulling from ssh://user@dummy/server |
|
107 searching for changes |
|
108 adding changesets |
|
109 adding manifests |
|
110 adding file changes |
|
111 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
|
112 OBSEXC: pull obsolescence markers |
|
113 OBSEXC: looking for common markers in [23] nodes (re) |
|
114 OBSEXC: merging obsolescence markers (171 bytes) |
|
115 OBSEXC: 2 markers added |
|
116 OBSEXC: DONE |
|
117 (run 'hg heads' to see heads) |
|
118 $ hg -R ../other pull |
|
119 pulling from ssh://user@dummy/server |
|
120 searching for changes |
|
121 no changes found |
|
122 OBSEXC: pull obsolescence markers |
|
123 OBSEXC: looking for common markers in [23] nodes (re) |
|
124 OBSEXC: no unknown remote markers |
|
125 OBSEXC: DONE |
|
126 |
|
127 $ cd .. |
|
128 |