##// END OF EJS Templates
abort when merging two heads and repository has local changes
abort when merging two heads and repository has local changes

File last commit:

r1044:4bfa960f default
r1581:db10b711 default
Show More
test-copy.out
51 lines | 1.4 KiB | text/plain | TextLexer
mpm@selenic.com
Add hg copy...
r363 A b
b
b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
mpm@selenic.com
Update tests
r1043 we should see two history entries
changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
files: b
description:
2
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
user: test
date: Thu Jan 1 00:00:00 1970 +0000
files: a
description:
1
we should see one log entry for a
changeset: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 1
this should show a revision linked to changeset 0
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 b789fdd96dc2 000000000000 000000000000
we should see one log entry for b
mpm@selenic.com
Fix tests for short changeset hashes and hidden manifest hashes
r784 changeset: 1:3b5b84850bbe
Thomas Arendsen Hein
Fixed tests for displaying tags in hg history and hg parents....
r388 tag: tip
mpm@selenic.com
Add hg copy...
r363 user: test
Samuel Tardieu
[PATCH] Print timezone offset when outputting dates...
r967 date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com
Add hg copy...
r363 summary: 2
mpm@selenic.com
Update tests
r1043 this should show a revision linked to changeset 1
rev offset length base linkrev nodeid p1 p2
0 0 65 0 1 9a263dd772e0 000000000000 000000000000
this should show the rename information in the metadata
copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
copy: a
Thomas Arendsen Hein
Updated output of tests.
r801 566e338d09a089ba737c21e0d3759980 .hg/data/b.d
mpm@selenic.com
run-tests: remove '+ hg' trick...
r925 60b725f10c9c85c70d97880dfe8191b3 bsum
60b725f10c9c85c70d97880dfe8191b3 asum
mpm@selenic.com
Add hg copy...
r363 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions