Edit Tree Conflicts dialog

Hi,

After merging a branch to trunk a tree conflict exists because a file was deleted in branch and in trunk a developer changed the same file. We would like to find out who deleted the file and who modified the file. So we choose the button Show log in the Edit Tree Conflicts Dialog. But in Show log we can only see the changes from trunk. To find out who deleted the file we have to change to the branch and open there Show log to see the history. That is not so comfortable. We think it would be very helpful if there would be a second Show log button in the Tree Conflicts Dialog to see the history of the branch too.

Or could you recommend us an easier way to find out the information?

Thanks,
Christina Mayer

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-02-23 11:09:09 CET