TortoiseSVN approches to resolve Tree Conflicts

Hi,

TortoiseSVN can help with several kinds of tree conflicts using *Edit
Conflict* window.

The problem is that in case of "*... upon merge*" conflict types TortoiseSVN
can't guess which files need to be merged.

For example, (case: *local missing, incoming delete upon update*)

· Developer A working on trunk modifies file Foo.c and commits it to
the repository.

· I working on branch move file Foo.c to Bar.c and commit it to the
repository.

A merge of developer A's changes to my branch working copy results in a tree
conflict:

· Bar.c is already in my working copy with status 'normal'

· Foo.c is marked as missing with a tree conflict

In most cases I need to merge Developer A’s changes to Foo.c into the
renamed Bar.c.

But how can I do it?

File Foo.c with Developer A’s changes does not present in my branch WC.

The *TortoiseSVN Help* says “*Note that if you copy the missing file from
the repository and then mark as resolved, your copy will be removed again.
You have to resolve the conflict first.*”

So, should I need to chechout *trunk* to have access to Foo.c file for
merge?

Is there more simple approach to solve this problem?

Thank you,

Sergey.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-08 11:17:47 CET