Mercurial > hg
view tests/test-merge-force.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 | 3682a19bb637 |
children |
line wrap: on
line source
created new head % local deleted a file, remote removed abort: outstanding uncommitted changes (use 'hg status' to list changes) resolving manifests removing a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) % should show a as removed R a % manifest. should not have a: b