image/svg+xml
./wc/trunk
.../tools
.../dist
.../test.sh
base-deleted
Local path
BASE_NODE
WORKING_NODE
rm
revert
cp ^/br2/tools2@90
normalcp-from: r90, ^/br2/tools2
normalcp-from: NULL
normalcp-from: NULLpristine: XXX2
^/trunk @50
^/.../tools @80
^/.../dist @60
^/.../test.sh @70pristine: XXX1
svn rm wc/trunk/tools
svn cp ^/br2/tools2@90 wc/trunk/tools
This diagram aims to show the changes required in the WC-NG "WORKING_NODE" table to represent local tree modifications such as "rm", "cp" and "revert". We can extend this to design how such operations, especially "revert", will work inside a subtree that is already locally modified (e.g. replaced).
(root of copy)cp-from: r90, ^/br2/tools2
(child of copy)cp-from: r90, ^/br2/tools2/dist2
(child of copy)cp-from: r90, ^/br2/.../test.sh2pristine: XXX2
--> (implied WORKING info)
rm --force
(normal)