equal
deleted
inserted
replaced
48 remote: added 2 changesets with 2 changes to 2 files |
48 remote: added 2 changesets with 2 changes to 2 files |
49 $ hg pull |
49 $ hg pull |
50 pulling from http://localhost:$HGPORT/ |
50 pulling from http://localhost:$HGPORT/ |
51 searching for changes |
51 searching for changes |
52 no changes found |
52 no changes found |
53 OBSEXC: pull obsolescence markers |
|
54 OBSEXC: looking for common markers in 2 nodes |
|
55 OBSEXC: no unknown remote markers |
|
56 OBSEXC: DONE |
|
57 $ hg pull -R ../other |
53 $ hg pull -R ../other |
58 pulling from http://localhost:$HGPORT/ |
54 pulling from http://localhost:$HGPORT/ |
59 requesting all changes |
55 requesting all changes |
60 adding changesets |
56 adding changesets |
61 adding manifests |
57 adding manifests |
62 adding file changes |
58 adding file changes |
63 added 2 changesets with 2 changes to 2 files |
59 added 2 changesets with 2 changes to 2 files |
64 OBSEXC: pull obsolescence markers |
60 pull obsolescence markers |
65 OBSEXC: looking for common markers in 2 nodes |
|
66 OBSEXC: no unknown remote markers |
|
67 OBSEXC: DONE |
|
68 (run 'hg update' to get a working copy) |
61 (run 'hg update' to get a working copy) |
69 $ hg push -R ../other |
62 $ hg push -R ../other |
70 pushing to http://localhost:$HGPORT/ |
63 pushing to http://localhost:$HGPORT/ |
71 searching for changes |
64 searching for changes |
72 no changes found |
65 no changes found |
96 searching for changes |
89 searching for changes |
97 remote: adding changesets |
90 remote: adding changesets |
98 remote: adding manifests |
91 remote: adding manifests |
99 remote: adding file changes |
92 remote: adding file changes |
100 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
93 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
101 OBSEXC: computing relevant nodes |
94 pushing 2 obsolescence markers (171 bytes) |
102 OBSEXC: looking for common markers in 2 nodes |
|
103 OBSEXC: computing markers relevant to 1 nodes |
|
104 OBSEXC: pushing 2 markers (171 bytes) |
|
105 OBSEXC: DONE |
|
106 $ hg push |
95 $ hg push |
107 pushing to http://localhost:$HGPORT/ |
96 pushing to http://localhost:$HGPORT/ |
108 searching for changes |
97 searching for changes |
109 no changes found |
98 no changes found |
110 OBSEXC: computing relevant nodes |
|
111 OBSEXC: looking for common markers in [23] nodes (re) |
|
112 OBSEXC: markers already in sync |
|
113 OBSEXC: no marker to push |
|
114 OBSEXC: DONE |
|
115 [1] |
99 [1] |
116 |
100 |
117 Pull |
101 Pull |
118 ============= |
102 ============= |
119 |
103 |
122 searching for changes |
106 searching for changes |
123 adding changesets |
107 adding changesets |
124 adding manifests |
108 adding manifests |
125 adding file changes |
109 adding file changes |
126 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
110 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
127 OBSEXC: pull obsolescence markers |
111 pull obsolescence markers |
128 OBSEXC: looking for common markers in [23] nodes (re) |
112 2 obsolescence markers added |
129 OBSEXC: merging obsolescence markers (171 bytes) |
|
130 OBSEXC: 2 markers added |
|
131 OBSEXC: DONE |
|
132 (run 'hg heads' to see heads) |
113 (run 'hg heads' to see heads) |
133 $ hg -R ../other pull |
114 $ hg -R ../other pull |
134 pulling from http://localhost:$HGPORT/ |
115 pulling from http://localhost:$HGPORT/ |
135 searching for changes |
116 searching for changes |
136 no changes found |
117 no changes found |
137 OBSEXC: pull obsolescence markers |
|
138 OBSEXC: looking for common markers in [23] nodes (re) |
|
139 OBSEXC: no unknown remote markers |
|
140 OBSEXC: DONE |
|
141 |
118 |
142 $ cd .. |
119 $ cd .. |
143 |
120 |
144 Test disabling obsolete advertisement |
121 Test disabling obsolete advertisement |
145 =========================================== |
122 =========================================== |