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

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

changelog: refuse to add revisions with empty usernames...
changelog: refuse to add revisions with empty usernames An empty username or a username with a "\n" will make the revision text contain two "\n\n" sequences -> corrupt repository. The problem is that changelog.read expects to find exactly one "\n\n" separator and thus cannot unpack the revision.
Augie Fackler - - Load All Authors

File last commit:

r7821:9fe7e6ac default
r8424:c5b3d3e3 default
Show More
test-commit-unresolved.out
14 lines | 481 B | text/plain | TextLexer
/ tests / test-commit-unresolved.out
History | Annotation | Raw |Copy content |Copy permalink
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% Merging a conflict araises
merging A
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)
% Mark the conflict as resolved and commit