equal
deleted
inserted
replaced
21 |
21 |
22 $ hg init server |
22 $ hg init server |
23 |
23 |
24 $ hg clone ssh://user@dummy/server client |
24 $ hg clone ssh://user@dummy/server client |
25 no changes found |
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 |
26 updating to branch default |
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32 $ cp -r client other |
28 $ cp -r client other |
33 |
29 |
34 Smoke testing |
30 Smoke testing |
46 remote: added 2 changesets with 2 changes to 2 files |
42 remote: added 2 changesets with 2 changes to 2 files |
47 $ hg pull |
43 $ hg pull |
48 pulling from ssh://user@dummy/server |
44 pulling from ssh://user@dummy/server |
49 searching for changes |
45 searching for changes |
50 no changes found |
46 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 |
47 $ hg pull -R ../other |
56 pulling from ssh://user@dummy/server |
48 pulling from ssh://user@dummy/server |
57 requesting all changes |
49 requesting all changes |
58 adding changesets |
50 adding changesets |
59 adding manifests |
51 adding manifests |
60 adding file changes |
52 adding file changes |
61 added 2 changesets with 2 changes to 2 files |
53 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) |
54 (run 'hg update' to get a working copy) |
67 $ hg push -R ../other |
55 $ hg push -R ../other |
68 pushing to ssh://user@dummy/server |
56 pushing to ssh://user@dummy/server |
69 searching for changes |
57 searching for changes |
70 no changes found |
58 no changes found |
76 $ echo 'A' > a |
64 $ echo 'A' > a |
77 $ hg amend |
65 $ hg amend |
78 $ hg push |
66 $ hg push |
79 pushing to ssh://user@dummy/server |
67 pushing to ssh://user@dummy/server |
80 searching for changes |
68 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: pushing 2 markers (171 bytes) |
|
85 OBSEXC: DONE |
|
86 remote: adding changesets |
69 remote: adding changesets |
87 remote: adding manifests |
70 remote: adding manifests |
88 remote: adding file changes |
71 remote: adding file changes |
89 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
72 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
90 $ hg push |
73 $ hg push |
91 pushing to ssh://user@dummy/server |
74 pushing to ssh://user@dummy/server |
92 searching for changes |
75 searching for changes |
93 no changes found |
76 no changes found |
94 OBSEXC: computing relevant nodes |
|
95 OBSEXC: looking for common markers in [23] nodes (re) |
|
96 OBSEXC: markers already in sync |
|
97 OBSEXC: no marker to push |
|
98 OBSEXC: DONE |
|
99 [1] |
77 [1] |
100 |
78 |
101 Pull |
79 Pull |
102 ============= |
80 ============= |
103 |
81 |
106 searching for changes |
84 searching for changes |
107 adding changesets |
85 adding changesets |
108 adding manifests |
86 adding manifests |
109 adding file changes |
87 adding file changes |
110 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
88 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
111 OBSEXC: pull obsolescence markers |
|
112 OBSEXC: looking for common markers in [23] nodes (re) |
|
113 OBSEXC: merging obsolescence markers (171 bytes) |
|
114 OBSEXC: 2 markers added |
|
115 OBSEXC: DONE |
|
116 (run 'hg heads' to see heads) |
89 (run 'hg heads' to see heads) |
117 $ hg -R ../other pull |
90 $ hg -R ../other pull |
118 pulling from ssh://user@dummy/server |
91 pulling from ssh://user@dummy/server |
119 searching for changes |
92 searching for changes |
120 no changes found |
93 no changes found |
121 OBSEXC: pull obsolescence markers |
|
122 OBSEXC: looking for common markers in [23] nodes (re) |
|
123 OBSEXC: no unknown remote markers |
|
124 OBSEXC: DONE |
|
125 |
94 |
126 $ cd .. |
95 $ cd .. |
127 |
96 |