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

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

patch: support diff data loss detection and upgrade...
patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.
Patrick Mezard - - Load All Authors

File last commit:

r9429:d8143769 default
r10189:e451e599 default
Show More
test-merge-default.out
28 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-merge-default.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
merge with other head by default, not tip....
 r2915 adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Vadim Gelfer
merge with other head by default, not tip....
 r2915 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Vadim Gelfer
merge with other head by default, not tip....
 r2915 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because not at a head
Dirkjan Ochtman
merge: only in-branch merges can be implicit
 r6723 abort: branch 'default' has 3 heads - please merge with an explicit rev
Vadim Gelfer
merge with other head by default, not tip....
 r2915 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because > 2 heads
Dirkjan Ochtman
merge: only in-branch merges can be implicit
 r6723 abort: branch 'default' has 3 heads - please merge with an explicit rev
Vadim Gelfer
merge with other head by default, not tip....
 r2915 % should succeed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should succeed - 2 heads
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
 r8387 changeset: 3:903c264cdf57
parent: 1:ba677d0156c1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: d
Vadim Gelfer
merge with other head by default, not tip....
 r2915 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Benoit Boissinot
improve error message for 'hg merge' when repo already at branchtip
 r5242 % should fail because at tip
abort: there is nothing to merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
merge with other head by default, not tip....
 r2915 % should fail because 1 head
abort: there is nothing to merge - use "hg update" instead