author | Patrick Mezard <pmezard@gmail.com> |
Sun, 19 Aug 2007 17:38:07 +0200 | |
changeset 5201 | 653790c2fa52 |
parent 4864 | fc8b3e7cbf6b |
permissions | -rw-r--r-- |
4777
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
1 |
# should fail - foo is not managed |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
2 |
foo: not copying - file is not managed |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
3 |
abort: no files to copy |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
4 |
? foo |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
5 |
# dry-run; print a warning that this is not a real copy; foo is added |
4864
fc8b3e7cbf6b
improve warning for hg add foo; hg mv foo bar
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4777
diff
changeset
|
6 |
foo has not been committed yet, so no copy data will be stored for bar. |
4777
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
7 |
A foo |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
8 |
# should print a warning that this is not a real copy; bar is added |
4864
fc8b3e7cbf6b
improve warning for hg add foo; hg mv foo bar
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4777
diff
changeset
|
9 |
foo has not been committed yet, so no copy data will be stored for bar. |
4777
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
10 |
A bar |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
11 |
# should print a warning that this is not a real copy; foo is added |
4864
fc8b3e7cbf6b
improve warning for hg add foo; hg mv foo bar
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4777
diff
changeset
|
12 |
bar has not been committed yet, so no copy data will be stored for foo. |
4777
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
13 |
A foo |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
14 |
# dry-run; should show that foo is clean |
44e17f5029d0
Make hg add foo; hg mv foo bar work.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4776
diff
changeset
|
15 |
C foo |
1117 | 16 |
# should show copy |
4776
719c402258ee
test-copy2: use status -C instead of debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4677
diff
changeset
|
17 |
A bar |
719c402258ee
test-copy2: use status -C instead of debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4677
diff
changeset
|
18 |
foo |
1117 | 19 |
# shouldn't show copy |
20 |
# should match |
|
21 |
rev offset length base linkrev nodeid p1 p2 |
|
22 |
0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
|
3659 | 23 |
bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
1117 | 24 |
# should not be renamed |
3659 | 25 |
bar not renamed |
1117 | 26 |
# should show copy |
4776
719c402258ee
test-copy2: use status -C instead of debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4677
diff
changeset
|
27 |
M bar |
719c402258ee
test-copy2: use status -C instead of debugstate | grep copy
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4677
diff
changeset
|
28 |
foo |
1117 | 29 |
# should show no parents for tip |
30 |
rev offset length base linkrev nodeid p1 p2 |
|
31 |
0 0 69 0 1 6ca237634e1f 000000000000 000000000000 |
|
32 |
1 69 6 1 2 7a1ff8e75f5b 6ca237634e1f 000000000000 |
|
33 |
2 75 82 1 3 243dfe60f3d9 000000000000 000000000000 |
|
34 |
# should match |
|
35 |
rev offset length base linkrev nodeid p1 p2 |
|
36 |
0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
|
37 |
1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 |
|
3659 | 38 |
bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 |
1117 | 39 |
# should show no copies |
4374
de612b5f8d59
Make copy --after work for files that have been hg added.
Brendan Cully <brendan@kublai.com>
parents:
3659
diff
changeset
|
40 |
# copy --after on an added file |
de612b5f8d59
Make copy --after work for files that have been hg added.
Brendan Cully <brendan@kublai.com>
parents:
3659
diff
changeset
|
41 |
A baz |
de612b5f8d59
Make copy --after work for files that have been hg added.
Brendan Cully <brendan@kublai.com>
parents:
3659
diff
changeset
|
42 |
bar |
4677
de8ec7e1753a
dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4374
diff
changeset
|
43 |
# 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:
4374
diff
changeset
|
44 |
C foo |
de8ec7e1753a
dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4374
diff
changeset
|
45 |
# 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:
4374
diff
changeset
|
46 |
M foo |
de8ec7e1753a
dirstate.status: if a file is marked as copied, consider it modified
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4374
diff
changeset
|
47 |
bar |