##// 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.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r6875:0d714a48 default
Show More
test-merge2.out
8 lines | 276 B | text/plain | TextLexer
/ tests / test-merge2.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 adding b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 adding b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head