[subversive-defects] RE: Merge on Synchronize View doesn't work

["Alexei Goncharov" <alexei.goncharov@xxxxxxxxxxxx>]

Hello Seva.

The fact is that it is not a defect.
>From now on and futher we simply do the SVN merge in merge view, but not
just show a preview, as earlier. Now this vew really shows the result of the
merge, allowing the user to make some corrections manually.
It is so also because we do not want to make some hacks to add merge
properties, supported by SVN 1.5, while our manual merge, cause it is really
a job of SVN itself.
So the conception is changed, and there will no be more builds with the
older behaviour.
Sorry for some discomfort, but we think that we do not need to fight with
SVN, but we should do as SVN.

Best regards, Alexei Goncharov.
Subversive Team.

-----Original Message-----
From: subversive-defects-bounces@xxxxxxxxxxx
[mailto:subversive-defects-bounces@xxxxxxxxxxx] On Behalf Of
subversive-defects-request@xxxxxxxxxxx
Sent: Sunday, September 14, 2008 7:16 PM
To: subversive-defects@xxxxxxxxxxx
Subject: subversive-defects Digest, Vol 4, Issue 2

Send subversive-defects mailing list submissions to
	subversive-defects@xxxxxxxxxxx

To subscribe or unsubscribe via the World Wide Web, visit
	https://dev.eclipse.org/mailman/listinfo/subversive-defects
or, via email, send a message with subject or body 'help' to
	subversive-defects-request@xxxxxxxxxxx

You can reach the person managing the list at
	subversive-defects-owner@xxxxxxxxxxx

When replying, please edit your Subject line so it is more specific than
"Re: Contents of subversive-defects digest..."


Today's Topics:

   1. Merge on Synchronize View doesn't work on 0.7.3 (Seva Lapsha)


----------------------------------------------------------------------

Message: 1
Date: Sun, 14 Sep 2008 13:32:06 +0300
From: "Seva Lapsha" <seva.lapsha@xxxxxxxxx>
Subject: [subversive-defects] Merge on Synchronize View doesn't work
	on 0.7.3
To: subversive-defects@xxxxxxxxxxx
Message-ID:
	<418013330809140332t1664ce01pc12051add4af53f6@xxxxxxxxxxxxxx>
Content-Type: text/plain; charset="iso-8859-1"

Hello,

The feature appearing on Properties->Team->SVN->Connector->Merge
Settings->Use SVN Merge View was working until I installed version 0.7.3

In the new version the plug-in first merges the changes while creating
multiple conflicts and then attempts to compare the damaged files with the
target sources.

Thus, the feature became just useless.

Do you have any nightly/integration builds which fix the defect?

Thanks in advance.
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
https://dev.eclipse.org/mailman/private/subversive-defects/attachments/20080
914/8c2d718b/attachment.html

------------------------------

_______________________________________________
subversive-defects mailing list
subversive-defects@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/subversive-defects


End of subversive-defects Digest, Vol 4, Issue 2
************************************************