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

re: .working file not as expected when merging

From: will vuong <wvuong_at_gmail.com>
Date: Mon, 24 Aug 2009 07:39:30 -0700 (PDT)

from http://groups.google.com/group/tortoisesvn/browse_thread/thread/2b1f9f6ff3c443ee

i see this bug when i do an svn update and i right click on a merged
file to get a 3 way diff from the svn update results dialog box. it
should show theirs, mine, merged but the content of the mine window is
pretty much the same as the merged window. i was expected the content
of the mine window to be the contents of my file before svn update
merge.

i installed the latest nightly build and i still see it.

---------- Forwarded message ----------
From: Stefan Küng <tortoise..._at_gmail.com>
Date: Aug 21, 1:16 am
Subject: TortoiseMerge: Possible bug
To: TortoiseSVN

On 20.08.2009 19:11, will vuong wrote:

> i ran into this bug in 1.6.4 yesterday.  has this been fixed yet?

I doubt it. There wasn't even a response to my report:http://
subversion.tigris.org/ds/viewMessage.do?dsMessageId=2374897&ds...

Maybe you can send a reply to my message on the svn dev list and try
to
give this a higher priority?

Stefan

--
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\    http://tortoisesvn.net
------------------------------------------------------http://
tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
To unsubscribe from this discussion, e-mail: [users-
unsubscr..._at_tortoisesvn.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386740
Received on 2009-08-24 16:54:39 CEST

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