Two more questions about "mix-and-match" working copy.

Hi everyone,

I am learning about "mix-and-match" working copy in TSVN (i.e. some files
point to the trunk and some files point to a branch).

Question 1
----------------
The repository already has a trunk and a branch for my project.

Step 1: I do a checkout from the trunk and so now I have a working copy with
all files and directories pointing to the trunk.

Step 2: I also do a checkout from the branch and so now I have another
working copy with all files and directories pointing to the branch.

Step 3: In the branch working copy, I create a file (let's call it foo.c)
and add/commit to the branch.

Step 4: Now in the trunk working copy, I would like to have a local copy of
the file foo.c and this file should point to the branch. Bascially this file
is for my own use (for now) and I don't want it to show up in the trunk. Is
this possible?

Question 2
----------------
This question is about "Update" and "Check for Modifications". The
repository already has a trunk and a branch for my project.

Step 1: I do a checkout from the trunk and so now I have a working copy with
all files and directories pointing to the trunk.

Step 2: I also do a checkout from the branch and so now I have another
working copy with all files and directories pointing to the branch.

Step 3: In the trunk working copy, I "switch" a file to point to the branch.
Note that both the trunk and branch have the same file with identical
revision. So now my working copy becomes a mix-and-match.

Step 4: For a reason, I delete the file in the branch (in the Repository
Browser).

Step 5: I do a "Update" on the mix-and-match working copy (top-level
directory) and the file is deleted. This kind of makes sense. But then the
problem is that when I do "Check for Modifications" on the top-level
directory of my mix-and-match working copy, TSVN said that there is no
difference but actually there is a difference : the trunk working copy has
foo.c but my working copy does not.

This kind of points to the fact that after I make my working copy to be
mix-and-match, I cannot trust Update nor "Check for Modifications" to
actually see or synchronize my working copy with the trunk.
Received on Sat Feb 11 09:39:21 2006