Rodrigo Miguel Sá Guerra wrote:
> I'm using the "branch/tag" command from the explorer context menu and
> it's not branching my "mixed" working copy.
>
> In my test scenario the revision of the branched folder as only one
> file, and the same folder in the trunk as now two files.
".. folder _h_as only" and "... trunk _h_as now to files".
Please try to write correctly - it is very hard to read and understand
what you really mean otherwise. "as" means something totally different
than "has".
> When I do an update from the trunk I get all files and folders, and that
> specific folder has two files (which is correct).
>
> Then I use the context menu to switch that specific folder to the
> revision that's in the branch (that as only one file).
>
> I browse my local working copy and it's all correct. All files and
> folders are equal to the contents of the trunk, and that specific folder
> as only one file (from the branch).
>
> Then I select the parent folder of my local working area, and I use the
> "branch/tag" command from the explorer context menu to create a tag with
> the configuration I described (Several files and folders from the trunk,
> and a specific folder with the content from a branch, that by now as
> only one file versus the two files that the same folder has in the trunk).
>
> When I look to the result of the branch, in that specific folder there
> are two files, when it only should be one, as it is in my working copy.
>
> This is the test I've done, and the results are those I appointed.
I guess I have to explain how Subversion is supposed to work:
- a working copy doesn't have a revision assigned to it, so a copy from
a working copy to the repository always does this to HEAD.
- a copy from a working copy to the repository does the following:
1. check the working copy for local modifications
2. create a copy from the URL which the working copy points to to the
URL you specify.
3. commit the local modifications of the working copy to that new copy
Info: steps 1-3 are done "in one step", i.e. only one new revision is
created.
As I told you before: your working copy is inconsistent! Since you
switched a subfolder to another revision your branch/tag command doesn't
work correctly. Sure, you can have subfolders switched to another
revision, but Subversion doesn't take this into account. E.g. if you
would make local modifications to your switched subfolder (or files in
it) you would get an error on the next commit!
Since the branch/tag command found no local modifications (and a working
copy doesn't have a revision number assigned to it) Subversion assumes
that it too points to HEAD.
So what you want to do is not possible, neither with TSVN nor the
Subversion command line client.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jul 5 18:43:37 2004