##// 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.
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r10189:e451e599 default
Show More
test-merge10.out
20 lines | 663 B | text/plain | TextLexer
/ tests / test-merge10.out
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: introduce mergestate
 r6512 merging testdir/subdir/a and testdir/a to testdir/subdir/a
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M testdir/subdir/a
diff -r d02b3fc32762 testdir/subdir/a
--- a/testdir/subdir/a
+++ b/testdir/subdir/a
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 -a
+alpha