Mercurial > hg
view tests/test-commit.out @ 6429:532ca442b903
symmetricdifference: move back to copies
It's too tightly dependent on known revlog ordering to fit well in ancestors
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 29 Mar 2008 12:39:47 -0500 |
parents | bae2e9c838e9 |
children | d557749c627a |
line wrap: on
line source
% commit date test transaction abort! rollback completed abort: empty commit message abort: impossible time zone offset: 4444444 abort: invalid date: '1\t15.1' abort: invalid date: 'foo bar' abort: date exceeds 32 bits: 111111111111 % commit added file that has been deleted nothing changed abort: file bar not found! adding dir/file dir/file adding dir.file abort: no match under directory dir! abort: no match under directory .! abort: no match under directory ../dir2! dir/file does-not-exist: No such file or directory abort: file does-not-exist not found! abort: file baz not tracked! abort: file quux not tracked! dir/file % partial subdir commit test adding bar/bar adding foo/foo % subdir log 1 changeset: 0:6ef3cb06bb80 user: test date: Mon Jan 12 13:46:40 1970 +0000 files: foo/foo description: commit-subdir-1 % subdir log 2 changeset: 1:f2e51572cf5a tag: tip user: test date: Mon Jan 12 13:46:41 1970 +0000 files: bar/bar description: commit-subdir-2 % full log changeset: 1:f2e51572cf5a tag: tip user: test date: Mon Jan 12 13:46:41 1970 +0000 files: bar/bar description: commit-subdir-2 changeset: 0:6ef3cb06bb80 user: test date: Mon Jan 12 13:46:40 1970 +0000 files: foo/foo description: commit-subdir-1 % dot and subdir commit test % full log changeset: 1:d9180e04fa8a tag: tip user: test date: Sat Jan 24 03:33:20 1970 +0000 files: foo/plain-file description: commit-foo-dot changeset: 0:80b572aaf098 user: test date: Mon Jan 12 13:46:40 1970 +0000 files: foo/plain-file description: commit-foo-subdir % subdir log changeset: 1:d9180e04fa8a tag: tip user: test date: Sat Jan 24 03:33:20 1970 +0000 summary: commit-foo-dot changeset: 0:80b572aaf098 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: commit-foo-subdir adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should fail because we are specifying a file name abort: cannot partially commit a merge (do not specify files or patterns) % should fail because we are specifying a pattern abort: cannot partially commit a merge (do not specify files or patterns) % should succeed