Mercurial > hg
view tests/test-share.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 | 2250fc372d34 |
children |
line wrap: on
line source
% prepare repo1 adding a % share it updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % contents of repo2/.hg pass: .hg/store does not exist $HGTMP/test-share/repo1/.hg % commit in shared clone % check original changeset: 1:8af4dc49db9e tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: change in shared clone changeset: 0:d3873e73d99e user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: init 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a a % commit in original adding b % check in shared clone changeset: 2:c2e0ac586386 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: another file changeset: 1:8af4dc49db9e user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: change in shared clone changeset: 0:d3873e73d99e user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: init 1 files updated, 0 files merged, 0 files removed, 0 files unresolved b % hg serve shared clone 200 Script output follows -rw-r--r-- 4 a -rw-r--r-- 2 b