Eclipse Community Forums: Subversive

Help

Home

Home » Eclipse Projects » Subversive » Merge tracking

Show: Today's Messages :: Show Polls :: Message Navigator

Merge tracking [message #9052]

Fri, 28 September 2007 23:06

Philippe Ombredanne

Messages: 386
Registered: July 2009

Senior Member

Hi:
Do you guys plan to work on merge tracking support for the latest SVN 1.5
versions?
Subclipse will not have it, it will be only released as a commercial
product.

--
Cheers, Philippe
http://www.nexb.com - http://eclipse.org/ve - http://eclipse.org/atf -
http://easyeclipse.org - http://phpeclipse.net

Report message to a moderator

Re: Merge tracking [message #9095 is a reply to message #9052]

Sat, 29 September 2007 05:22

Eugene Kuleshov

Messages: 504
Registered: July 2009

Senior Member

Philippe Ombredanne wrote:
> Do you guys plan to work on merge tracking support for the latest SVN 1.5
> versions?
> Subclipse will not have it, it will be only released as a commercial
> product.
>
Philippe, this is not accurate. As far as I know Subversion merge
tracking is part of the CollabNet Desktop which is closed-source, but
free product.

regards,
Eugene

Report message to a moderator

Re: Merge tracking [message #9115 is a reply to message #9095]

Sat, 29 September 2007 19:30

Philippe Ombredanne

Messages: 386
Registered: July 2009

Senior Member

"Eugene Kuleshov" <eu@md.pp.ru> wrote in message
news:fdkneb$tbd$1@build.eclipse.org...
> Philippe Ombredanne wrote:
> > Do you guys plan to work on merge tracking support for the latest SVN
1.5
> > versions?
> > Subclipse will not have it, it will be only released as a commercial
> > product.
> Philippe, this is not accurate. As far as I know Subversion merge
> tracking is part of the CollabNet Desktop which is closed-source, but
> free product.
> regards,
> Eugene
Eugene:
you are right, and I am wrong, yet in my book, freeware and commercial mean
the same thing.
:-)

Report message to a moderator

Re: Merge tracking [message #9783 is a reply to message #9052]

Tue, 23 October 2007 00:16

Yvan BARTHÃ?LEMY

Messages: 1
Registered: July 2009

Junior Member

On 2007-09-29 01:06:11 +0200, "Philippe Ombredanne"
<pombredanne@nexb.com> said:

> Hi:
> Do you guys plan to work on merge tracking support for the latest SVN 1.5
> versions?
> Subclipse will not have it, it will be only released as a commercial
> product.

http://subclipse.tigris.org/issues/show_bug.cgi?id=639

....

------- Additional comments from Mark Phippard Tue Jun 12 15:18:23
-0700 2007 -------
We are working on a new merge UI as part of the CollabNet Desktop which sits on
top of Subclipse. We probably will not have any time to do anything with the
Subclipse dialog for this release. The CollabNet Desktop is free for everyone
and will be actively maintained.

We are trying to do as many features/work as possible in Subclipse code base,
but some features need to live in the CollabNet-branded product. It is
possible
we will be able to push more of these into Subclipse later.

Just wanted to provide this as an update to those wondering what is happening.

Right now, when the CollabNet Desktop is installed, the user has two merge
options. The current one, and a "CollabNet Merge". We might look at
alternatives, such as replacing the Subclipse option (or creating a preference)
when the CollabNet Desktop is installed.

Report message to a moderator

Re: Merge tracking [message #9806 is a reply to message #9783]

Tue, 23 October 2007 21:57

Philippe Ombredanne

Messages: 386
Registered: July 2009

Senior Member

"Yvan BARTH

Report message to a moderator

Re: Merge tracking [message #9826 is a reply to message #9806]

Fri, 26 October 2007 17:54

Eclipse User

Originally posted by: dserodio.gmail.com

Philippe Ombredanne wrote:
> "Yvan BARTHÉLEMY" <ybarthelemy@free.fr> wrote in message
> news:ffjehl$mjl$1@build.eclipse.org...
>>> Subclipse will not have it, it will be only released as a commercial
>>> product.
>> http://subclipse.tigris.org/issues/show_bug.cgi?id=639
> Yvan: Thanks for the pointer, but that is nothing new. The point is that
> merge tracking in subclipse will NOT be open source afaik.
> Note that Subversive is no better there. There is no community, they
> maintain a project elsewhere, and none from the project team asnwers
> questions here.

The fact that Subclipse won't have this feature should be enough to
motivate Polarion to offer it in Subversive. Then one of the "open
source Subversion for Eclipse plugins" would have a real benefit over
the other.

Then again, they don't seem very "open" about Subversive development...

Regards,
Daniel Serodio

Report message to a moderator

Re: Merge tracking [message #9848 is a reply to message #9806]

Sun, 28 October 2007 16:48

Mark Phippard

Messages: 129
Registered: July 2009

Senior Member

On 2007-10-23 17:57:55 -0400, "Philippe Ombredanne"
<pombredanne@nexb.com> said:

> "Yvan BARTHÉLEMY" <ybarthelemy@free.fr> wrote in message
> news:ffjehl$mjl$1@build.eclipse.org...
>>> Subclipse will not have it, it will be only released as a commercial
>>> product.
>> http://subclipse.tigris.org/issues/show_bug.cgi?id=639
> Yvan: Thanks for the pointer, but that is nothing new. The point is that
> merge tracking in subclipse will NOT be open source afaik.
> Note that Subversive is no better there. There is no community, they
> maintain a project elsewhere, and none from the project team asnwers
> questions here.

Just to clarify, there is a lot of merge tracking functionality in
Subclipse already. For example, this blog post talks about what
TortoiseSVN is doing:

http://blogs.open.collab.net/svn/2007/10/tortoisesvn-and.htm l

Subclipse has pretty much all the same features, just with the tool
specific differences of how it is implemented.

The CollabNet merge client simply goes above and beyond all of this in
terms of making merge easier and harnessing the power that exists in
merge tracking with Subversion 1.5. Subclipse and TortoiseSVN give you
graphical equivalents of what you can do with the command line.

Mark

Report message to a moderator

Re: Merge tracking [message #10051 is a reply to message #9806]

Tue, 30 October 2007 13:09

Igor Vinnykov

Messages: 61
Registered: July 2009

Member

Hello Philippe,

First of all I want to reply on the first question - yes, we will add merge
tracking support to Subversive and already started to work on this feature
(take a look to 1.2 stream at polarion.org).

I also want to announce that togther with Eclipse Foundation we finally
found solution for licensing problems, which previously blocked us to
migrate project here from polarion.org. It means that now Subversive is an
official project under Eclipse umbrella. I think that it's a good sign for
all people interested in Eclipse and SVN. We have big plans for this project
and want to push it forward as fast as we can.

Best regards,
Igor Vinnykov

"Philippe Ombredanne" <pombredanne@nexb.com>

Report message to a moderator

Previous Topic:	svn gets out of sync
Next Topic:	Re: [spaces-dev] SVN or CVS?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Apr 19 13:44:40 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter