##// END OF EJS Templates
merge with crew-stable
merge with crew-stable

File last commit:

r4744:44e17f50 default
r4782:37e11c76 merge default
Show More
test-copy2.out
47 lines | 1.7 KiB | text/plain | TextLexer
Alexis S. L. Carvalho
Make hg add foo; hg mv foo bar work....
r4744 # should fail - foo is not managed
foo: not copying - file is not managed
abort: no files to copy
? foo
# dry-run; print a warning that this is not a real copy; foo is added
foo was marked for addition. bar will not be committed as a copy.
A foo
# should print a warning that this is not a real copy; bar is added
foo was marked for addition. bar will not be committed as a copy.
A bar
# should print a warning that this is not a real copy; foo is added
bar was marked for addition. foo will not be committed as a copy.
A foo
# dry-run; should show that foo is clean
C foo
mpm@selenic.com
fix some rename/copy bugs...
r1117 # should show copy
Alexis S. L. Carvalho
test-copy2: use status -C instead of debugstate | grep copy
r4743 A bar
foo
mpm@selenic.com
fix some rename/copy bugs...
r1117 # shouldn't show copy
# should match
rev offset length base linkrev nodeid p1 p2
0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
Matt Mackall
refactor debugrenamed
r3652 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
mpm@selenic.com
fix some rename/copy bugs...
r1117 # should not be renamed
Matt Mackall
refactor debugrenamed
r3652 bar not renamed
mpm@selenic.com
fix some rename/copy bugs...
r1117 # should show copy
Alexis S. L. Carvalho
test-copy2: use status -C instead of debugstate | grep copy
r4743 M bar
foo
mpm@selenic.com
fix some rename/copy bugs...
r1117 # should show no parents for tip
rev offset length base linkrev nodeid p1 p2
0 0 69 0 1 6ca237634e1f 000000000000 000000000000
1 69 6 1 2 7a1ff8e75f5b 6ca237634e1f 000000000000
2 75 82 1 3 243dfe60f3d9 000000000000 000000000000
# should match
rev offset length base linkrev nodeid p1 p2
0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000
Matt Mackall
refactor debugrenamed
r3652 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
mpm@selenic.com
fix some rename/copy bugs...
r1117 # should show no copies
Brendan Cully
Make copy --after work for files that have been hg added.
r4376 # copy --after on an added file
A baz
bar
Alexis S. L. Carvalho
dirstate.status: if a file is marked as copied, consider it modified...
r4677 # foo was clean:
C foo
# but it's considered modified after a copy --after --force
M foo
bar