Mercurial > hg
view tests/test-pull-update.out @ 11142:0bf79efeaa20
test-subrepo-svn: fix strange svn behaviour on windows
I got a full path when pusing the external like:
Sending C:/foo/bar/test-subrepo-svn/sub/t/s/alpha
instead of the relative path
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 10 May 2010 22:52:28 +0200 |
parents | a3d73b3e1f8a |
children |
line wrap: on
line source
adding foo updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) % should fail pulling from ../t searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) merging foo 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should work pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved