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

Bug: Wrong changes are merged.

From: Viktor <vshlayer_at_gmail.com>
Date: Fri, 06 Sep 2013 11:49:02 +0300

Hi all,

I see an issue with TortoiseSVN 1.8.99, Build 24735 - 64 Bit -dev,
2013/09/04 21:19:40
Yes, it is latest nightly build (and it has no Issue #547). But issue
below was originally detected in the latest stable release.

When I'm trying to merge revision from my dev branch to live it makes a
merge, but I'm getting completely different changes being merged.

Here is a diff between files I'm getting from merge dialog (besides,
file is marked as conflicted, but winmerge, same as built in diff tool,
shows no conflicts):

Please note that when on merge screen I choose revision number r82358
and diff below shows that it works with r82357.

And here is what was actually changed in revision I'm trying to merge
into live:

Hope this info is enough to see the problem and place to report a bug is

With regards


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-06 10:56:23 CEST

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.