Re: I found a bug?about resolve conflict~

It would be better to recreate this scenario using the command line client
and then ask on the Subversion [email protected] list.

Subclipse is just plugging into an API provided by Subversion.  It flags
the conflict as well as applies the resolution.  Subclipse does not touch
the contents of your files, it is all done by Subversion as a result of the
API calls.

I will say that looking at your example, you can see by the way it places
the conflict markers how it has interpreted the conflicting box.  The
choice you made is basically just picking one of those chunks or the other,
so the result seems consistent with how it flagged the conflict.  It is
almost always better to choose one of the options that opens an editor so
you can review and resolve all of the conflicts and then mark it resolved
by saying you have edited the file to resolve the conflicts rather than
letting it apply a resolution.

I usually use the built-in options in special scenarios like binary files,
or in cases where I know I want to discard all of the changes on one side
or the other.



On Mon, Sep 9, 2013 at 12:22 PM, gaohongyan <[email protected]> wrote:

> (1)myeclipse1 create java file content:
> package test;
>
> public class Test {
>
>         public static void main(String[] args) {
>                 System.out.println("1");
>                 System.out.println("2");
>                 System.out.println("3");
>                 System.out.println("4");
>                 System.out.println("5");
>                 System.out.println("6");
>                 System.out.println("7");
>                 System.out.println("8");
>                 System.out.println("9");
>                 System.out.println("10");
>         }
>
> }
> commit it to test1 repository
> (2)checkout test1 repository to desktop test22 directiroy.
> (3)test22 import to myeclipse2 and edit java file content:
> package test;
>
> public class Test {
>
>         public static void main(String[] args) {
>                 System.out.println("1");
>                 System.out.println("2 2");
>                 System.out.println("3 2");
>                 System.out.println("4 2");
>                 System.out.println("5");
>                 System.out.println("6");
>                 System.out.println("7");
>                 System.out.println("8");
>                 System.out.println("9");
>                 System.out.println("10");
>         }
>
> }
> commit to test1 repository.
> (4)show myeclipse1 Test.java file  edit it content:
> package test;
>
> public class Test {
>
>         public static void main(String[] args) {
>                 System.out.println("1");
>                 System.out.println("2");
>                 System.out.println("3");
>                 System.out.println("4 1");
>                 System.out.println("5 1");
>                 System.out.println("6 1");
>                 System.out.println("7");
>                 System.out.println("8");
>                 System.out.println("9");
>                 System.out.println("10");
>         }
>
> }
> and invoke Update menu.
> content change bottom:
> package test;
>
> public class Test {
>
>         public static void main(String[] args) {
>                 System.out.println("1");
> <<<<<<< .mine
>                 System.out.println("2");
>                 System.out.println("3");
>                 System.out.println("4 1");
>                 System.out.println("5 1");
>                 System.out.println("6 1");
> =======
>                 System.out.println("2 2");
>                 System.out.println("3 2");
>                 System.out.println("4 2");
>                 System.out.println("5");
>                 System.out.println("6");
> >>>>>>> .r4
>                 System.out.println("7");
>                 System.out.println("8");
>                 System.out.println("9");
>                 System.out.println("10");
>         }
>
> }
>
> (5)invoke "maked resolved" menu,checked "Resolve conflicts in local file
> with my changes" option, Test.java file content change bottom:
> package test;
>
> public class Test {
>
>         public static void main(String[] args) {
>                 System.out.println("1");
>                 System.out.println("2");
>                 System.out.println("3");
>                 System.out.println("4 1");
>                 System.out.println("5 1");
>                 System.out.println("6 1");
>                 System.out.println("7");
>                 System.out.println("8");
>                 System.out.println("9");
>                 System.out.println("10");
>         }
>
> }
> (6)My question is, why don't you into the following this?
> package test;
>
> public class Test {
>
>         public static void main(String[] args) {
>                 System.out.println("1");
>                 System.out.println("2 2");
>                 System.out.println("3 2");
>                 System.out.println("4 1");
>                 System.out.println("5 1");
>                 System.out.println("6 1");
>                 System.out.println("7");
>                 System.out.println("8");
>                 System.out.println("9");
>                 System.out.println("10");
>         }
>
> }
> (7)Thank you lot~
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3064222
>
> To unsubscribe from this discussion, e-mail: [
> [email protected]].
>



-- 
Thanks

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

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3064223

To unsubscribe from this discussion, e-mail: [[email protected]].