##// 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.
Stefano Tortarolo - - Load All Authors

File last commit:

r7278:45495d78 default
r10189:e451e599 default
Show More
test-rebase-conflicts.out
66 lines | 856 B | text/plain | TextLexer
/ tests / test-rebase-conflicts.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
Add rebase extension
 r6906 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278 @ 5: L3
|
o 4: L2
Stefano Tortarolo
Add rebase extension
 r6906 |
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1
% Try to call --continue
abort: no rebase in progress
% Conflicting rebase
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% Try to continue without solving the conflict
abort: unresolved merge conflicts (see hg resolve)
% Conclude rebase
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278 added 3 changesets with 3 changes to 3 files
Stefano Tortarolo
Add rebase extension
 r6906 rebase completed
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278 @ 5: L3
|
o 4: L2
Stefano Tortarolo
Add rebase extension
 r6906 |
o 3: L1
|
o 2: C3
|
o 1: C2
|
o 0: C1
Stefano Tortarolo
rebase: avoid redundant merges (issue1301)
 r7278
% Check correctness
- Rev. 0
c1
- Rev. 1
c1
c2
- Rev. 2
c1
c2
c3
- Rev. 3
c1
c2
c3
- Rev. 4
resolved merge
- Rev. 5
resolved merge