RE: Proper way to delete file from repository

Bob,
   Thanks for the reply.
   My process is shown below. Can you possibly provide a comment on whether this is the way we should be deleting a file or not? Should we first delete the file from the trunk, then merge the trunk to our branches, then merge the branches back to the trunk?

1. File structure:
Trunk\foo1.cs
Trunk\foo2.cs

Branches\user1\foo1.cs
Branches\user1\foo2.cs

Branches\user2\foo1.cs
Branches\user2\foo2.cs

Branches\user3\foo1.cs
Branches\user3\foo2.cs

2. User 1 sends out an email, "Hey, we don't need foo1.cs any more, so let's delete it".

3. Users delete foo1.cs from their branches:
Trunk\foo1.cs
Trunk\foo2.cs

Branches\user1\foo2.cs <user1 deleted foo1.cs from their branch>

Branches\user2\foo2.cs <user2 deleted foo1.cs from their branch>

Branches\user3\foo2.cs <user3 deleted foo1.cs from their branch>

4. User 1 merges their changes into the trunk.
<user1 does merge from trunk directory of their branch and gets a tree conflict on file foo1.cs>

5. User 2 merges their changes into the trunk.
<user2 does merge from trunk directory of their branch and gets a tree conflict on file foo1.cs>

6. User 3 merges their changes into the trunk.
<user3 does merge from trunk directory of their branch and gets a tree conflict on file foo1.cs>

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3065189

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-24 20:29:34 CEST