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

Re: Re: [Subclipse-users] no conflicts

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 30 Mar 2009 11:44:19 -0400

On Mon, Mar 30, 2009 at 11:40 AM, <webpost_at_tigris.org> wrote:
> One file had the text:
> //testing
> The other one had:
> //testing change
> //with extra row
> Both were committed, and if I compare them I can see that the correct content is compared.
> The files are marked as updated both in the console and in eclipse GUI. I like subclipse, but cant understand this.
> I've tried with subclipse 1.4.7 and 1.4.8

Subclipse does not do the work. It is a UI layer on top of the
Subversion libraries. When you take the merge option we run the
Subversion API for merge and it does all of the work of talking to the
server and updating the local files and deciding if it can
automatically merge the content or not.

If you were to run the svn merge command from the command line you
should get the exact same results.

If you really doubt Subversion and want to test then make your tests
more realistic. Create a file with a dozen lines and make more
realistic changes. Like changing different words on the same line or
adding a line in the middle etc.

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-03-30 17:44:29 CEST

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.