##// 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-url-rev.out
132 lines | 2.8 KiB | text/plain | TextLexer
/ tests / test-url-rev.out
History | Source | Raw |Copy content |Copy permalink
Alexis S. L. Carvalho
parseurl: also return the revision after the "#"; add a test
 r5222 marked working directory as branch foo
% clone repo#foo
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch foo
Alexis S. L. Carvalho
parseurl: also return the revision after the "#"; add a test
 r5222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Alexis S. L. Carvalho
clone: if "url#rev" was given, update to rev
 r5223 % heads
changeset: 1:cd2a86ecc814
branch: foo
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change a
% parents
Alexis S. L. Carvalho
parseurl: also return the revision after the "#"; add a test
 r5222 changeset: 1:cd2a86ecc814
branch: foo
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change a
[paths]
default = #foo
% changing original repo
changeset: 3:4cd725637392
tag: tip
parent: 0:1f0dee641bb7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add bar
changeset: 2:faba9097cad4
branch: foo
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: new head of branch foo
changeset: 1:cd2a86ecc814
branch: foo
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change a
changeset: 0:1f0dee641bb7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
% outgoing
2:faba9097cad4
% push
changeset: 2:faba9097cad4
branch: foo
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: new head of branch foo
% rolling back
rolling back last transaction
% incoming
2:faba9097cad4
% pull
changeset: 2:faba9097cad4
branch: foo
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: new head of branch foo
Alexis S. L. Carvalho
pull -u: if "url#rev" was given, update to rev
 r5224 % pull should not have updated
1:cd2a86ecc814
% going back to the default branch
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset: 0:1f0dee641bb7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
% no new revs, no update
0:1f0dee641bb7
% rollback
rolling back last transaction
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0:1f0dee641bb7
% pull -u takes us back to branch foo
changeset: 2:faba9097cad4
branch: foo
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: new head of branch foo
% rollback
rolling back last transaction
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% parents
0:1f0dee641bb7
% heads
1:cd2a86ecc814
% pull -u -r otherrev url#rev updates to rev
% parents
Dirkjan Ochtman
clone: honor -r even when pulling named branches
 r7045 changeset: 3:4cd725637392
tag: tip
parent: 0:1f0dee641bb7
Alexis S. L. Carvalho
pull -u: if "url#rev" was given, update to rev
 r5224 user: test
date: Thu Jan 01 00:00:00 1970 +0000
Dirkjan Ochtman
clone: honor -r even when pulling named branches
 r7045 summary: add bar
Alexis S. L. Carvalho
pull -u: if "url#rev" was given, update to rev
 r5224
% heads
changeset: 3:4cd725637392
tag: tip
parent: 0:1f0dee641bb7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add bar
changeset: 2:faba9097cad4
branch: foo
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: new head of branch foo