Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-url-rev.out @ 5403:477136fa6571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always copy the necessary files before applying a git patch This patch removes the "copymod" attribute from the gitpatch class. AFAICS, that attribute was only used to delay the copying of renamed/copied files if there are no other changes to the target, but in this case, if there are changes to the source, we'll end up copying the wrong version. This should fix issue762.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 06 Oct 2007 15:30:15 -0300
parents 20817af258d8
children
line wrap: on
line source

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

% 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


% 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


% 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
changeset:   2:faba9097cad4
branch:      foo
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     new head of branch foo

% 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