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

Re: "Merge with ancestry" message

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-05-19 08:52:55 CEST

Alexander Klenin wrote:
> TortoiseSVN 1.4.3, Build 9436 - 32 Bit -dev
> In a "Merge finished" dialog, if one of the revisions was also a merge,
> instead of usual "merged filename.txt", the line of the following kind
> appears:
> Command: Merging
> svn://vpserver/insight/branches/Service516/smolin_terentyev_68811 from
> revision 90843 to 90860 into W:\516, respecting ancestry
> Where "Command" part is displayed under "Action" column,
> and the rest of the message -- under "Path" column.
> Although I understand what happened, this displaying method seems
> non-intuitive.
> I have no concrete proposal, because I do not know full range of
> possible merge messages,
> but at least "Action" column should still display "Merge" or "Update",
> not "Command", and "Path" column should either display path only or be
> renamed to "Path and extra info" or some such.

What you see there isn't the output of the merge itself. I guess the
merge you tried didn't touch/change any files at all.
The line "Command: ..." is added by TSVN before some commands you
execute, showing you exactly what command and which parameters it used.
See issue #348 for details:


   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 Sat May 19 08:53:17 2007

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