##// 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.
Patrick Mezard - - Load All Authors

File last commit:

r6815:7d6622ea default
r6875:0d714a48 default
Show More
test-branches.out
45 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-branches.out
History | Annotation | Raw |Copy content |Copy permalink
marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
marked working directory as branch c
marked working directory as branch a branch name much longer than the default justification used by branches
a branch name much longer than the default justification used by branches 6:b8cb5af34c4d
b 4:22df7444f7c1
a 1:dd6b440dd85a
c 5:5ca481e59b8c (inactive)
default 0:19709c5a4e75 (inactive)
-------
a branch name much longer than the default justification used by branches 6:b8cb5af34c4d
b 4:22df7444f7c1
a 1:dd6b440dd85a
--- Branch a
changeset: 1:dd6b440dd85a
branch: a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: Adding a branch
---- Branch b
changeset: 4:22df7444f7c1
branch: b
parent: 2:ac22033332d1
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: Adding b branch head 2
changeset: 3:aee39cd168d0
branch: b
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: Adding b branch head 1
changeset: 2:ac22033332d1
branch: b
parent: 0:19709c5a4e75
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: Adding b branch