[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Branch and Merge problem?

From: Edwin <edwintai_at_gmail.com>
Date: Mon, 1 Mar 2010 18:14:08 -0800 (PST)

> 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 :)

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2453754

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-02 03:14:13 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.