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

RE: Re: tortise svn: principal bug

From: icegood <icegood1980_at_gmail.com>
Date: Mon, 7 Dec 2015 03:59:44 -0800 (PST)

Yep, this is true. But it doesn't mean that we cannot overcome that. Say, with 'mine' everything is clear while
'theirs' might become just differ between svn:base and some fictitious new revision. I don't think that it's principal for merger on what files we apply for it. It's very well decoupled from svn itself. On other hand i think it would be very very useful for others especcialy when they know on how merger works.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-12-07 12:59:52 CET

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

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