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

Re: Merging displays different information

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 07 Aug 2008 17:41:07 +0200

farlin wrote:
> Dear All,
>
> We have been using 1.4 version of tortoise for maintaining our
> repository version for a while now. Recently we also have upgraded the
> client side to use 1.5.2, and may I say I just love the new interface.
>
> I have a question though, while merging does the merging technique in
> CLI differs from the merging technique at GUI? I have tried a merge
> between trunk and branch and CLI provides a different reading in the
> merge log to that of GUI's log.
>
> CLI reported : 13 conflicts, 3 deleted, 27 added and 10 skipped.
> GUI reported : 2 conflicts, 1 deleted, 38 added and 10 skipped.
>
> However, when we checked the outcome, we got same number of conflict
> output. There was actually 13 conflicted files.

Ups, thanks for the report.
Fixed in r13657.

> Here are my questions:
>
> 1. Does GUI's default setting ignores anything, why was it catching
> conflicts and marking them as ADD?
> 2. what is the proper CLI imitation command for the GUI's default
> merge settings?
>
> 3. How can I make sure both replies same way, because we would require
> merging code very frequently and we do not wish to spend too much time
> worrying about the merger.

The bug is only in the progress dialog, showing the wrong information.
Nothing to worry about: the merge is not affected and finishes correctly.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-08-07 17:41:25 CEST

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