Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » how to disable "edit conflicts" view
how to disable "edit conflicts" view [message #38776] Thu, 04 December 2008 12:07 Go to next message
Ukasz is currently offline UkaszFriend
Messages: 1
Registered: July 2009
Junior Member
Hi,

Before installing subversive i used svn from commandline.
Every conflict was then shown in editor as something like:
<code>
<<< mine
[...]
>>> r.121212
[...]
</code>

Only thing I had to do was to edit it normally.

Now I only see a red icon telling me there are conflicts, and can only
edit them in highly nousable for me "team> edit conflicts" view.

How can I enable the old behaviour? I tinkered with options and couldn't
find the right one.

Best regards,
--
&#321;ukasz Gruner
Re: how to disable "edit conflicts" view [message #38844 is a reply to message #38776] Mon, 08 December 2008 09:11 Go to previous message
Igor Burilo is currently offline Igor BuriloFriend
Messages: 435
Registered: July 2009
Senior Member
Hello Ukasz,

You still have the ability to merge conflicts by hand when you have sets of
markers (i.e. <<<, >>>>) which compose the changes you made in the
conflicting area.
You can do it in the following way: if you have a conflict file after
synchronization you need to call Update action, after this in you workspace
you'll have 3 new files: filename.mine, filename.rOLDREV, filename.rNEWREV
and also your original file will contain conflicting markers. Do you have
these 3 new files?

Also note: If Subversion considers the file to be mergeable, it places
conflict markers-special strings of text that delimit the "sides" of the
conflict-into the file to visibly demonstrate the overlapping
areas.(Subversion uses the svn:mime-type property to decide if a file is
capable of contextual, line-based merging.)
So probably your file isn't considered as mergeable.

Just for testing you can do the following:
create and commit file conflicts.txt with the content:
A
B
C
D
E

Then change and commit file content outside the Eclipse, e.g. by checking
out project in a different workspace using command line,
A
B
C1
D1
E

Change file in your Eclipse workspace to:
A
B
M
N
E

Make update in Eclipse, as a result you should have 3 new files and
conflicts.txt should have content smth. like this
A
B
<<<<<<< .mine
M
N
=======
C1
D1
>>>>>>> .r4473
E

Is it reproducable for you?

What Eclipse and Subversion, SVN Connector do use?


> Hi,
>
> Before installing subversive i used svn from commandline.
> Every conflict was then shown in editor as something like:
> <code>
> <<< mine
> [...]
>>>> r.121212
> [...]
> </code>
>
> Only thing I had to do was to edit it normally.
>
> Now I only see a red icon telling me there are conflicts, and can only
> edit them in highly nousable for me "team> edit conflicts" view.
>
> How can I enable the old behaviour? I tinkered with options and couldn't
> find the right one.
>
> Best regards,
> --
> &#321;ukasz Gruner
>
Previous Topic:Assertion Failure: in SVNAnnotationGenerator.normalizeBlames():current chunks should always start at
Next Topic:Prevent replace from deleting a file
Goto Forum:
  


Current Time: Thu Sep 20 19:56:24 GMT 2018

Powered by FUDForum. Page generated in 0.01920 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top