[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Tree conflicts case 2 - a question

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 25 Feb 2009 22:28:26 +0000

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.

Simon

-- 
:       ___
:  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=1229315
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-25 23:28:33 CET

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.