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-01 18:14:10 PST
Message > I don't see why you need to base your new bugfix release on exactly 1.1.1. I
> would expect that only real bugfixes and not new features enter the 1.1.x
> branch, i.e. that it remains relatively stable otherwise. So, if a user
> reports an error in 1.1.1, the first thing I would do is to check if 1.1.2
> doesn't already include a fix for it. Otherwise, just grab the 1.1.x branch,
> apply a bugfix and afterwards tag version 1.1.3 which you then give to the
> user.
in our real operation environment,1.1.1 is production version,1.1.2 is
QA/QT version.
when 1.1.1 has bugs in production,we should fixed it first before
1.1.2.
1.1.2 may include 1.1.1 bugs but we should fix 1.1.1 first and quickly
test to production again.

> > But I can’t merge successful now. It always report error tree conflict
> > or md5-checksum not present error message. Am I wrong?
>
> Actually, I just hope that I understood what you were doing. Your description
> is a bit vague. In any case, I guess the problem is that you want to "revert
> to 1.1.x revision 100", which I believe is simply wrong and/or unnecessary,
> but maybe I just don't understand what it is you're trying to do.
could we use tag to debug? if not,which version should we use to fixed
and commit?

in branch folder we only have 1.1.x and latest version may already
1.1.3.
so I think if we don't use branch folder,we should use revert to
revision

best regards :)

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