tests/test-url-rev.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 15 Jul 2010 21:44:51 +0200
changeset 11578 bb7af1de5e38
parent 11175 39e7f14a8286
permissions -rw-r--r--
discovery: remove duplication for new remote head discovery

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
updating to branch foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% heads
changeset:   1:cd2a86ecc814
branch:      foo
tag:         tip
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

% parents
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

changeset:   0:1f0dee641bb7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add a


% rolling back
rolling back to revision 1 (undo push)
% 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

changeset:   0:1f0dee641bb7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add a


% 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 to revision 1 (undo pull)
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 to revision 1 (undo pull)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% parents
0:1f0dee641bb7
% heads
1:cd2a86ecc814
0:1f0dee641bb7
% pull -u -r otherrev url#rev updates to rev
% parents
changeset:   3:4cd725637392
tag:         tip
parent:      0:1f0dee641bb7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add bar

% 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