Login | Register
My pages Projects Community openCollabNet

Discussions > users > Branch and Merge problem?

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Branch and Merge problem?

Author Edwin <edwintai at gmail dot com>
Full name Edwin <edwintai at gmail dot com>
Date 2010-03-01 00:37:24 PST
Message In the past time, I branch from trunk when I achieve milestone.
Root /trunk
        /branch/1.1.1
If it has bugs need to fix,I branch from 1.1.1 become
Root /trunk
        /branch/1.1.1
        /branch/1.1.2
If it has bugs need to fix,I branch from 1.1.2 become
Root /trunk
        /branch/1.1.1
        /branch/1.1.2
        /branch/1.1.3
When 1.1.3 fixing,1.1.1 has bugs to fixed, I need to fix 1.1.1 branch
and merge 1.1.1 to 1.1.2 to 1.1.3 and finally merge back to trunk

It spends much time to checkout each version, so now we change to
another branch method. We use 1.1.X to replace 1.1.1 now become

Root /trunk
       /branch/1.1.x revision 100
If there is no bugs to fix, We tag 1.1.1 from 1.1.x
Root /trunk
        /branch/1.1.x
        /tag/1.1.1 revision 101
If it has bugs to fix, we fix on 1.1.x and then tag to 1.1.2 become
Root /trunk
        /branch/1.1.x revision 120
        /tag/1.1.1
        /tag/1.1.2 revision 121
So 1.1.x has latest fix in branch, we only need to merger 1.1.x and
trunk
But here comes a problem if 1.1.1 report bugs, we need to revert to
1.1.x revision 100 and commit become revision 122 to fix bugs may
become revision 130. After revert we lost 1.1.2 revision 120’s fixed.
We need to merge 120 and 130.
But I can’t merge successful now. It always report error tree conflict
or md5-checksum not present error message. Am I wrong?

« Previous message in topic | 1 of 19 | Next message in topic »

Messages

Show all messages in topic

Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-01 00:37:24 PST
     Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-01 04:27:52 PST
         Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-01 18:14:10 PST
             Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-02 00:56:17 PST
                 Blame info unclear "Davison, Steve D" <steve dot d dot davison at intel dot com> "Davison, Steve D" <steve dot d dot davison at intel dot com> 2010-03-02 15:12:19 PST
                     Re: Blame info unclear steveking Stefan Küng 2010-03-03 09:59:01 PST
                         Re: Blame info unclear simonlarge Simon Large 2011-04-29 23:43:40 PDT
                             Re: Blame info unclear simonlarge Simon Large 2011-05-05 01:08:10 PDT
                                 Re: Blame info unclear steveking Stefan Küng 2011-05-06 09:19:12 PDT
                                     Re: Blame info unclear simonlarge Simon Large 2011-05-06 15:51:52 PDT
                                         Re: Blame info unclear steveking Stefan Küng 2011-05-06 22:53:13 PDT
                                             Re: Blame info unclear simonlarge Simon Large 2011-05-07 13:50:26 PDT
                                                 Re: Blame info unclear steveking Stefan Küng 2011-05-07 23:18:02 PDT
                                                     Re: Blame info unclear simonlarge Simon Large 2011-05-10 13:27:11 PDT
                 Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-02 19:51:29 PST
                     Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-03 04:14:32 PST
                         Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-03 08:55:10 PST
                             Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-04 03:56:45 PST
                                 Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-07 18:37:22 PST
Messages per page: