comparison tests/test-graft.t @ 32267:c2380b448265

caches: move the 'updating the branch cache' message in 'updatecaches' We are about to remove the branchmap cache update in changegroup application. There is a debug message alongside this update that we do not want to loose. We move the message beforehand to simplify the test update in the next changeset. The message move is quite noisy and isolating that noise is useful. Most tests update are just line reordering since the message is issued at a later point during the transaction. After this changes, the message is displayed in more case since local commit creation also issue it.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 02 May 2017 22:27:44 +0200
parents 3a755652ce3a
children 96f43981c1c4
comparison
equal deleted inserted replaced
32266:2b6692df1bdf 32267:c2380b448265
175 premerge successful 175 premerge successful
176 committing files: 176 committing files:
177 b 177 b
178 committing manifest 178 committing manifest
179 committing changelog 179 committing changelog
180 updating the branch cache
180 grafting 5:97f8bfe72746 "5" 181 grafting 5:97f8bfe72746 "5"
181 searching for copies back to rev 1 182 searching for copies back to rev 1
182 unmatched files in other (from topological common ancestor): 183 unmatched files in other (from topological common ancestor):
183 c 184 c
184 resolving manifests 185 resolving manifests
188 getting e 189 getting e
189 committing files: 190 committing files:
190 e 191 e
191 committing manifest 192 committing manifest
192 committing changelog 193 committing changelog
194 updating the branch cache
193 $ HGEDITOR=cat hg graft 4 3 --log --debug 195 $ HGEDITOR=cat hg graft 4 3 --log --debug
194 scanning for duplicate grafts 196 scanning for duplicate grafts
195 grafting 4:9c233e8e184d "4" 197 grafting 4:9c233e8e184d "4"
196 searching for copies back to rev 1 198 searching for copies back to rev 1
197 unmatched files in other (from topological common ancestor): 199 unmatched files in other (from topological common ancestor):