comparison tests/test-subrepo.out @ 11069:12f04d18143e stable

subrepo: add test for issue1977
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Fri, 30 Apr 2010 19:50:37 -0300
parents a375d1777594
children 37d1b20168d1
comparison
equal deleted inserted replaced
11068:a375d1777594 11069:12f04d18143e
259 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
260 [paths] 260 [paths]
261 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute 261 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute
262 [paths] 262 [paths]
263 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