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

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

add a fix for issue 1175...
add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r6875:0d714a48 default
Show More
test-simple-update.out
25 lines | 775 B | text/plain | TextLexer
/ tests / test-simple-update.out
History | Annotation | Raw |Copy content |Copy permalink
adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../branch
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
foo
bar
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo