Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Re: [Subclipse-users] no conflicts

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: Re: [Subclipse-users] no conflicts

Author markphip
Full name Mark Phippard
Date 2009-03-30 08:44:20 PDT
Message On Mon, Mar 30, 2009 at 11:40 AM, <webpost at tigris dot 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.

--
Thanks

Mark Phippard
http://markphip.blogspot.com/

« Previous message in topic | 4 of 8 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
[Subclipse-users] no conflicts webpost at tigris dot org webpost at tigris dot org 2009-03-30 08:23:27 PDT
     Re: [Subclipse-users] no conflicts markphip Mark Phippard 2009-03-30 08:26:10 PDT
         RE: Re: [Subclipse-users] no conflicts webpost at tigris dot org webpost at tigris dot org 2009-03-30 08:40:19 PDT
             Re: Re: [Subclipse-users] no conflicts markphip Mark Phippard 2009-03-30 08:44:20 PDT
                 RE: Re: Re: [Subclipse-users] no conflicts webpost at tigris dot org webpost at tigris dot org 2009-03-30 09:00:59 PDT
                     Re: Re: Re: [Subclipse-users] no conflicts markphip Mark Phippard 2009-03-30 09:16:44 PDT
             Re: Re: [Subclipse-users] no conflicts jcompagner jcompagner 2009-03-30 09:08:11 PDT
                 RE: Re: Re: [Subclipse-users] no conflicts webpost at tigris dot org webpost at tigris dot org 2009-03-30 09:29:03 PDT
Messages per page: