##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.
Ronny Pfannschmidt - - Load All Authors

File last commit:

r10490:f2618cac stable
r11237:feb2a58f stable
Show More
test-copy.out
52 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-copy.out
History | Annotation | Raw |Copy content |Copy permalink
A b
b
b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
committed changeset 1:76973b01f66a012648546c979ea4c41de9e7d8cd
we should see two history entries
changeset: 1:76973b01f66a
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: b
description:
2
changeset: 0:33aaa84a386b
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: a
description:
1
we should see one log entry for a
changeset: 0:33aaa84a386b
user: test
date: Mon Jan 12 13:46:40 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
changeset: 1:76973b01f66a
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
this should show a revision linked to changeset 1
rev offset length base linkrev nodeid p1 p2
0 0 65 0 1 37d9b5d994ea 000000000000 000000000000
this should show the rename information in the metadata
copy: a
copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
4999f120a3b88713bbefddd195cf5133 .hg/store/data/b.i
60b725f10c9c85c70d97880dfe8191b3 bsum
60b725f10c9c85c70d97880dfe8191b3 asum
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions