Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Branch and Merge problem?

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

tortoisesvn
Discussion topic

Back to topic list

Re: Branch and Merge problem?

Author Edwin <edwintai at gmail dot com>
Full name Edwin <edwintai at gmail dot com>
Date 2010-03-02 19:51:29 PST
Message In my operation case, all of our production go publish need to pass QA
testing and then on board.
if there are bugs in earlier version which is production already,we
have to fix in few hours.
if the bugs are already fixed in QA ex.v1.1.0 is production v1.1.1
testing not finish
we need to fix v1.1.0 first before v1.1.1 testing finish because it's
real emergency.
if we fix and wait until v1.1.1 testing finish go production,
that would not on time and may include other bugs in v1.1.1 ,every
changes may casue other problems should consider.

branch merge conflicts I think we could resovle it by hands,
I only worry about if we don't branch when we fix bugs in new branch.
ex.
1.we fix bugs in branch v1.1.0 then tags v1.1.1
2.QA report bugs we fix bugs v1.1.0 too and tags v1.1.2
3.when we need to fix v1.1.1 is there have good way to use
In my opinion,we can use branch v1.1.1 fix it and merge to v1.1.2
but there is a company policy,we can't fix in tags and we can't branch
other 1.1 version in branches

« Previous message in topic | 15 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: