[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
RE: [subversive-dev] Interactive Merge
|
Hello Marcos.
Yes, it is true and false at the same time. The interactive Merege feature
is still left, but it now only shows conflicts and skipped files.
As I've already said in the bugs opened for Subversive, and I think I should
say this somewhere more in public (e.g. newsgroup), we do not support the
"fully" interactive merge because of SVN 1.5 merge-tracking properties.
The fact is that earlier we have just asked SVN for merge preview and built
the preview in the merge view, so that the user could decide what changes
does he want to accept and what he does not. But now it is impossible cause
we simply do not want to do SVN job of calculating and setting
merge-tracking properties, cause it is totally SCM to do that, and if we
make some failure by calculating this manually, everithing can break in your
project structure history.
It's really a pity, but it is true, that now only the merge conflicts and
skipped files are shown in the merge view.
Thanks for your interest and best regards,
Alexei Goncharov (Subversive Team)
-----Original Message-----
From: subversive-dev-bounces@xxxxxxxxxxx
[mailto:subversive-dev-bounces@xxxxxxxxxxx] On Behalf Of Marcos Hack
Sent: Tuesday, December 09, 2008 11:46 PM
To: subversive-dev@xxxxxxxxxxx
Subject: [subversive-dev] Interactive Merge
Hello,
I read some messages saying that the Interactive Merge feature was removed
from Subversive plugin in Eclipse 3.4 (version 0.7.4 of Subversive). Is it
true?
There is still a note about this feature in the "Merging"
documentation section [1].
Regards and thank you for the very usefull tool.
Marcos Hack.
[1]
http://www.eclipse.org/subversive/documentation/teamSupport/SVNaction/merge.
php
_______________________________________________
subversive-dev mailing list
subversive-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/subversive-dev
