##// END OF EJS Templates
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.

File last commit:

r9475:c295a82a default
r10189:e451e599 default
Show More
test-bheads.out
154 lines | 3.6 KiB | text/plain | TextLexer
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 0: Adding root node
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 0: Adding root node
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
marked working directory as branch a
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 2: Adding b branch
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 2: Adding b branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 4: Adding b branch head 2
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 4: Adding b branch head 2
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 5: Adding b branch head 3
4: Adding b branch head 2
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 5: Adding b branch head 3
4: Adding b branch head 2
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
marked working directory as branch c
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
Brendan Cully
Small fixes for 8e503fa54d2d (hg heads branch)
r4649 no changes on branch c containing . are reachable from 3
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 1
-------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 0
-------
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0
-------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 0
-------
Sune Foldager
localrepo: fix bugs in branchheads and add docstring...
r9475 6: Merging b branch head 2 and b branch head 3
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 0
-------
Brendan Cully
Small fixes for 8e503fa54d2d (hg heads branch)
r4649 no changes on branch b containing . are reachable from 7
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 1
=======
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 0: Adding root node
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
=======
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 1: Adding a branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 7: Adding c branch
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
abort: unknown revision 'z'!
-------
=======
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 0: Adding root node
1: Adding a branch
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
7: Adding c branch