Re: please help me!
Jamie Jackson <[email protected]> Sun, 29 Sep 2013 20:44:52 -0400
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CA+onWPcwixC+XHhstxswDLVoM8cL2QsMKJEMhxMD2Xo3tjsjDQ@mail.gmail.com> |
I'm not sure I follow your scenario completely, but the answer to your question is because you merged in revision 8, right? What did you expect instead? On Sun, Sep 29, 2013 at 3:44 AM, gaohongyan <[email protected]> wrote: > 1 1 11 111 > 111 111 111 > 2 2 22 222 > 222 2222 22222 > 3 3 33 333 > 3333 333 3333 > 4 4 44 444 > 4444 444 4444 > 5 5 55 555 > 5555 5555 5555 > 6 6 66 666 > 666 666 666 > 7 7 77 777 > 777 777 7777 > 8 8 88 888 > 888 888 8888 > 9 9 99 999 > 999 9999 9999 > 10 10 1010 101010 > 1010 1010 1010 > 2 3 4 5 6 > 7 8 > trunk branches branches > branches branches branches > branches > > from branches to trunk > merge range :4-5,8 > > result: > 111 > <<<<<<< .working > 222 > 333 > 444 > ======= > 22222 > 3333 > 4444 > >>>>>>> .merge-right.r8 > 555 > 666 > 7777 > 8888 > 999 > 101010 > > why 7777,8888 show result ??? > > ------------------------------------------------------ > > http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065442 > > To unsubscribe from this discussion, e-mail: [ > [email protected]]. > ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065466 To unsubscribe from this discussion, e-mail: [[email protected]].