Hi Stefan!
Thank you for your answer.
I think you spotted my main problem.
You wrote:
> By choosing "resolve" in that menu, you told TSVN that
> the current state in your working directory is what you like to have to have the tree conflict resolved.
In fact, I wanted to tell TSVN "I want to deal with it now". This is what "resolve" means to me.
> Since the "moved"/old files were still present in your working copy,
> TSVN took that as you want these files to be kept there.
> Since they were gone on the server, that translated to an add of these files.
This explains it.
But from my perspective onto the workflow it doesn't make sense.
This behavior does not differentiate between changed and unchanged files.
And it ignores the fact that I was never asked whether I want to add or keep anything.
If a directory is dirty (changed/ignored/unversioned files), it seems to be not touched at all on a removing update,
but I would find it much more logical to deal on a removing update on a file-by-file
basis and remove everything that is clean.
Maybe the state "added" is - although maybe technically correct - misleading.
A file should be "modified, server side gone", or "unmodified, server side gone",
and in the latter case it should be removed on update with or without asking.
In my opinion an option to delete everything that was under version control
and unchanged - and leaving the other (changed/unversioned/ignored) files lying around -
would be great.
So a directory is gone on the server, you update,
and all files under version control that were unchanged are removed.
You keep a directory that is marked "not under version control"
with some leftovers.
For all the details of your workflow you wrote: thank you very much, I'll study them as soon as time permits.
Mit freundlichen GrĂ¼ĂŸen
Dr. Hartmut Niemann
Siemens AG
MO MLT LM EN CCI 1
Werner-von-Siemens-Str. 67
91052 Erlangen, Deutschland
Tel.: +49 9131 7-34264
mailto:hartmut.niemann_at_siemens.com
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3158720
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-02-05 12:25:54 CET