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

Re: 3 propositions for evolutions

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-02-13 19:13:52 CET

Scott Nicolson wrote:
>> It seems to me that the actual problem is that while merge conflicts
>> are available for review and possible rejection of updates,
>> successfully merged files are not, yet there are cases when
>> successful textual merge results in semantic conflict.
>> I doubt it is possible to implement in TSVN without Subversion
>> support, but I think correct solution would be to add "Use mine/theirs
>> version" menu item to successfully merged files in update dialog
>> similar to "Resolve using mine/theirs" item for conflicted files.
>> "Use theirs" will be equivalent to "Revert", but "Use mine" should
>> preserve local modifications made before update (which is IMHO the
>> essence to the original poster's wish).
> Bingo. This would solve the problem also. That way we could see the
> changes resulting from the merge.



   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Feb 13 19:14:18 2007

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.