Jump to content

merge not linking correct lines


f1wade

Recommended Posts

Hello,

 

We have plastic and are using it quite well for almost everything we need it for.

 

But, we have a big problem with merges, 

as we do sometimes work on the same files as each other, the merge machine seems to think we have both altered the same parts of the file, (which in some cases we have).

but in 1 we add if statement around the whole method, and delete 1 line within.

and in 2 we delete or alter 4-5 lines within in the method (these lines want to be within the if statement when merged)

 

but merge wants to keep the new if statement, without the lower } from 1, and then add the 2 below the 1, and then the } from the if in 1 is auto added to the result as needed.

 

example

file 1

 

if(true)

{

 

line 1

line 2(delete)

line 3

line 4

line 5

line 6

}

 

file 2 

 

line 1

line 2

this is changed 3

line 4

line 5 (delete)

line 6

 

result should be

 

if(true)

{

line 1

line 2(delete)

this is changed 3

line 4

line 5 (delete)

line 6

}

 

merge gives me

 

-------------------red file 1-----------------------------

if(true)

{

line 1

line 2(delete)

line 3

line 4

line 5

line 6

-----------------------green file 2----------------------------

line 1

line 2

this is changed 3

line 4

line 5 (delete)

line 6

--------------------auto merged-------------------------------

}

 

so if i choose file 2 on the merge i get this result

 

line 1

line 2

this is changed 3

line 4

line 5 (delete)

line 6

}

 

and if i choose file 2 on the merge i get this result

 

if(true)

{

line 1

line 2(delete)

line 3

line 4

line 5

line 6

}

 

so both options delete data.

 

I think the svn merge in eclipse does this better.

 

any ideas how i can fix this?

or can the people at plastic work on this to fix the merge machine in the next release please? I am happy to help in any way i can.

Link to comment
Share on other sites

Archived

This topic is now archived and is closed to further replies.

×
×
  • Create New...