Show More
@@ -83,3 +83,76 b' check that bundle is not affected' | |||||
83 | adding file changes |
|
83 | adding file changes | |
84 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
84 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
85 | (run 'hg heads' to see heads) |
|
85 | (run 'hg heads' to see heads) | |
|
86 | $ cd .. | |||
|
87 | ||||
|
88 | pull does not fetch excessive changesets when common node is hidden (issue4982) | |||
|
89 | ------------------------------------------------------------------------------- | |||
|
90 | ||||
|
91 | initial repo with server and client matching | |||
|
92 | ||||
|
93 | $ hg init pull-hidden-common | |||
|
94 | $ cd pull-hidden-common | |||
|
95 | $ touch foo | |||
|
96 | $ hg -q commit -A -m initial | |||
|
97 | $ echo 1 > foo | |||
|
98 | $ hg commit -m 1 | |||
|
99 | $ echo 2a > foo | |||
|
100 | $ hg commit -m 2a | |||
|
101 | $ cd .. | |||
|
102 | $ hg clone --pull pull-hidden-common pull-hidden-common-client | |||
|
103 | requesting all changes | |||
|
104 | adding changesets | |||
|
105 | adding manifests | |||
|
106 | adding file changes | |||
|
107 | added 3 changesets with 3 changes to 1 files | |||
|
108 | updating to branch default | |||
|
109 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
110 | ||||
|
111 | server obsoletes the old head | |||
|
112 | ||||
|
113 | $ cd pull-hidden-common | |||
|
114 | $ hg -q up -r 1 | |||
|
115 | $ echo 2b > foo | |||
|
116 | $ hg -q commit -m 2b | |||
|
117 | $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129 | |||
|
118 | $ cd .. | |||
|
119 | ||||
|
120 | client only pulls down 1 changeset | |||
|
121 | ("all local heads known remotely" may change if the wire protocol discovery | |||
|
122 | commands ever stop saying they have hidden changesets) | |||
|
123 | ||||
|
124 | $ cd pull-hidden-common-client | |||
|
125 | $ hg pull --debug | |||
|
126 | pulling from $TESTTMP/pull-hidden-common (glob) | |||
|
127 | query 1; heads | |||
|
128 | searching for changes | |||
|
129 | all local heads known remotely | |||
|
130 | 3 changesets found | |||
|
131 | list of changesets: | |||
|
132 | 96ee1d7354c4ad7372047672c36a1f561e3a6a4c | |||
|
133 | a33779fdfc23063680fc31e9ff637dff6876d3d2 | |||
|
134 | bec0734cd68e84477ba7fc1d13e6cff53ab70129 | |||
|
135 | listing keys for "phase" | |||
|
136 | listing keys for "bookmarks" | |||
|
137 | bundle2-output-bundle: "HG20", 3 parts total | |||
|
138 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload | |||
|
139 | bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload | |||
|
140 | bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload | |||
|
141 | bundle2-input-bundle: with-transaction | |||
|
142 | bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported | |||
|
143 | adding changesets | |||
|
144 | add changeset 96ee1d7354c4 | |||
|
145 | add changeset a33779fdfc23 | |||
|
146 | add changeset bec0734cd68e | |||
|
147 | adding manifests | |||
|
148 | adding file changes | |||
|
149 | adding foo revisions | |||
|
150 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
151 | bundle2-input-part: total payload size 1378 | |||
|
152 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |||
|
153 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |||
|
154 | bundle2-input-bundle: 2 parts total | |||
|
155 | checking for updated bookmarks | |||
|
156 | listing keys for "phases" | |||
|
157 | updating the branch cache | |||
|
158 | (run 'hg heads' to see heads, 'hg merge' to merge) |
General Comments 0
You need to be logged in to leave comments.
Login now