Hi
Ran into a problem switching from one branch to another yesterday.
This left me with a src tree partly in one branch and partly in another.
In principal if you have an uncommitted file in your branch when you
switch from one to another this uncommitted file is left where it is.
It is not deleted but it does not become added to the new branch,
it is just a uncommitted file in the same place.
This is also true for directories.
However beware having uncommitted files inside new directories
that are committed, or even just directories that exist in one branch but not another.
Basically I can replicate the problem I had by having two branches A, and B
initially the same, include a file called "xfile.txt" and have the newsubdir
come before it alphabetically.
In branch A I create
newsubdir
newsubdir/subsubdirA
newsubdir/subsubdirA/fileA.txt
newsubdir/subsubdirB
newsubdir/subsubdirB/fileB.txt
I then commit
newsubdir
newsubdir/subsubdirA
newsubdir/subsubdirA/fileA.txt
But leave
newsubdir/subsubdirB
newsubdir/subsubdirB/fileB.txt
Uncommitted. (ie unversioned)
When I then switch there is a rather ambigous message along the lines of
"Wont delete locally modified directory, left locally modified or unversioned files"
But what this doesnt say is that the switch was killed at this point.
All files processed up to this point are in one branch, all those that would be processed
after are in the original branch still.
The directory in question is marked as in conflict but the problem is that any files
after it are left untouched.
Examining the properties on the root dir shows branch B,
but examining xfile.txt shows branch A
I would expect something along the lines of
A) A check before anything is actually switched that then prompts the user along the
lines shown, asking them to commit or remove unversioned files.
B) Rollback to original state if this encountered
or most prefferred
C) Continuation of the switch leaving just the one problem directory marked as conflicting
and everything else actually switched. The prompt should probably have
"directory x contains conflicts" added to it to clarify things.
I am not a member of this list but I am submitting this so that my findings are known,
feel free to contain me directly if you need.
Rob
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 1 15:02:03 2006