Mercurial > hg
view tests/test-eol-clone.out @ 11346:e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 14 Jun 2010 13:39:00 -0400 |
parents | 0bb67503ad4b |
children |
line wrap: on
line source
% setup repository adding .hgeol adding a.txt % hg clone repo repo-2 updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt first\r second\r third\r % hg cat a.txt first second third % hg clone repo repo-3 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt first second third % hg clone -r 1 repo repo-4 requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % cat .hgeol [patterns] **.txt = native % printrepr.py a.txt first\r second\r third\r