Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-copy2.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 21 Jun 2007 23:42:06 -0300
changeset 4677 de8ec7e1753a
parent 4376 de612b5f8d59
child 4743 719c402258ee
permissions -rw-r--r--
dirstate.status: if a file is marked as copied, consider it modified After a "hg copy --force --after somefile cleanfile", cleanfile shouldn't be considered clean anymore.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
     1
 
# should show copy
1127
19b048da4da9 Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1117
diff changeset 
     2
 
copy: foo -> bar
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
     3
 
# shouldn't show copy
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
     4
 
# should match
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
     5
 
   rev    offset  length   base linkrev nodeid       p1           p2
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
     6
 
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
3652
f4dece0f7016 refactor debugrenamed
Matt Mackall <mpm@selenic.com>
parents: 1127
diff changeset 
     7
 
bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
     8
 
# should not be renamed
3652
f4dece0f7016 refactor debugrenamed
Matt Mackall <mpm@selenic.com>
parents: 1127
diff changeset 
     9
 
bar not renamed
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    10
 
# should show copy
1127
19b048da4da9 Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1117
diff changeset 
    11
 
copy: foo -> bar
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    12
 
# should show no parents for tip
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    13
 
   rev    offset  length   base linkrev nodeid       p1           p2
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    14
 
     0         0      69      0       1 6ca237634e1f 000000000000 000000000000
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    15
 
     1        69       6      1       2 7a1ff8e75f5b 6ca237634e1f 000000000000
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    16
 
     2        75      82      1       3 243dfe60f3d9 000000000000 000000000000
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    17
 
# should match
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    18
 
   rev    offset  length   base linkrev nodeid       p1           p2
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    19
 
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    20
 
     1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000
3652
f4dece0f7016 refactor debugrenamed
Matt Mackall <mpm@selenic.com>
parents: 1127
diff changeset 
    21
 
bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
1117
30ab5b8ee8ec fix some rename/copy bugs
mpm@selenic.com
parents:
diff changeset 
    22
 
# should show no copies
4376
de612b5f8d59 Make copy --after work for files that have been hg added.
Brendan Cully <brendan@kublai.com>
parents: 3652
diff changeset 
    23
 
# copy --after on an added file
de612b5f8d59 Make copy --after work for files that have been hg added.
Brendan Cully <brendan@kublai.com>
parents: 3652
diff changeset 
    24
 
A baz
de612b5f8d59 Make copy --after work for files that have been hg added.
Brendan Cully <brendan@kublai.com>
parents: 3652
diff changeset 
    25
 
  bar
4677
de8ec7e1753a dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4376
diff changeset 
    26
 
# foo was clean:
de8ec7e1753a dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4376
diff changeset 
    27
 
C foo
de8ec7e1753a dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4376
diff changeset 
    28
 
# but it's considered modified after a copy --after --force
de8ec7e1753a dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4376
diff changeset 
    29
 
M foo
de8ec7e1753a dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4376
diff changeset 
    30
 
  bar
mercurial