Mercurial > hg

comparison tests/test-subrepo.out @ 11078:37d1b20168d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 01 May 2010 15:15:35 -0500
parents 7b0a0d498cc0 12f04d18143e
children c2601c216333
comparison
equal deleted inserted replaced
11077:132d783d6a87 11078:37d1b20168d1
161 searching for changes 161 searching for changes
162 no changes found 162 no changes found
163 pushing ...subrepo s 163 pushing ...subrepo s
164 searching for changes 164 searching for changes
165 (did you forget to merge? use push -f to force) 165 (did you forget to merge? use push -f to force)
166 pushing ...subrepo t
167 searching for changes
168 no changes found
169 searching for changes
170 adding changesets
171 adding manifests
172 adding file changes
173 added 1 changesets with 1 changes to 1 files
174 pushing ...sub/t 166 pushing ...sub/t
175 pushing ...subrepo ss 167 pushing ...subrepo ss
176 searching for changes 168 searching for changes
177 no changes found 169 no changes found
178 pushing ...subrepo s 170 pushing ...subrepo s
183 added 1 changesets with 1 changes to 1 files (+1 heads) 175 added 1 changesets with 1 changes to 1 files (+1 heads)
184 pushing ...subrepo t 176 pushing ...subrepo t
185 searching for changes 177 searching for changes
186 no changes found 178 no changes found
187 searching for changes 179 searching for changes
188 no changes found 180 adding changesets
181 adding manifests
182 adding file changes
183 added 1 changesets with 1 changes to 1 files
189 % update 184 % update
190 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
191 committing subrepository t 186 committing subrepository t
192 % pull 187 % pull
193 pulling ...sub/t 188 pulling ...sub/t
264 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 259 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
265 [paths] 260 [paths]
266 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute 261 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute
267 [paths] 262 [paths]
268 default = $HGTMP/test-subrepo/sub/mercurial/main/../nested_relative 263 default = $HGTMP/test-subrepo/sub/mercurial/main/../nested_relative
264 % issue 1977
265 adding a
266 adding .hgsub
267 committing subrepository s
268 updating to branch default
269 pulling subrepo s
270 requesting all changes
271 adding changesets
272 adding manifests
273 adding file changes
274 added 1 changesets with 1 changes to 1 files
275 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
276 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
277 created new head
278 committing subrepository s
279 abort: push creates new remote heads on branch 'default'!
280 0 files updated, 0 files merged, 0 files removed, 0 files unresolved