Mercurial > hg
view tests/test-fetch.out @ 6267:d036ea711140
Check for patches repo with os.path.isdir not os.path.exists
author | Eric Hopper <hopper@omnifarious.org> |
---|---|
date | Sun, 02 Mar 2008 08:51:02 -0800 |
parents | 35bf9c23e17a |
children | 0750f11152fe |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b 1:97d72e5f12c7 % should pull one change pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1:97d72e5f12c7 adding c 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % should merge c into a pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) updating to 2:97d72e5f12c7 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging with 1:5e056962225c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 3:cd3a41621cf0 merges remote changes with local a b c % fetch over http, no auth pulling from http://localhost:20059/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) updating to 2:97d72e5f12c7 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging with 1:5e056962225c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 3:... merges remote changes with local Automated merge with http://localhost:20059/ % fetch over http with auth (should be hidden in desc) pulling from http://user:***@localhost:20059/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) updating to 2:97d72e5f12c7 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging with 1:5e056962225c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 3:... merges remote changes with local Automated merge with http://localhost:20059/ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved adding f adding g % should merge f into g pulling from ../f searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merging with 3:cc6a3744834d 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 4:55aa4f32ec59 merges remote changes with local % should abort, because i is modified abort: working directory is missing some files