Re: bug in add/add tree conflict?

On Wed, Apr 22, 2009 at 20:31, Stefan Sperling <stsp_at_elego.de> wrote:
> On Wed, Apr 22, 2009 at 08:05:20PM +0200, Greg Stein wrote:
>> On Wed, Apr 22, 2009 at 19:41, Stefan Sperling <stsp_at_elego.de> wrote:
>> > The incoming item is already versioned. It is safe, it can
>> > be recovered from history.
>> >
>> > The locally added item has not reached the repository yet,
>> > it is not "safe" yet in the sense that a backup of it
>> > could be retrieved from the repo at any time.
>>
>> Not entirely true. It may have local mods after the copy occurred.
>
> I don't understand what you mean.
>
> What is "it" in your sentence?

I misread your sentence as saying there *is* a backup. Never mind.
We're both saying the same thing.

And I meant that the locally-added item could have edits made after the copy.

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1864490
Received on 2009-04-22 20:59:40 CEST