Re: Tree conflicts case 2 - a question

Simon Large wrote:
> Hi Stefan,
>
> The docs for tree conflict case 2 state:
> Dev A renames Foo.c to Bar.c and commits
> Dev B edits Foo.c and updates
> In Dev B's working copy:
> Foo.c is marked as added.
> Bar.c is added to the working copy, but may not contain developer A's
> modifications.
>
> Why would Bar.c not contain A's modifications? It definitely won't
> contain B's modifications to Foo.c, but it should be exactly what A
> committed to the repository.

I think the comments indicates only that (at the time the document was
written) there was an issue open about that. I remember that there were
some edge cases where Bar.c did not contain developer A's modifications.
But I think that issue has been fixed.

At least in all my tests it worked ok.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1233801
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].