[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: Tue, 2 Mar 2010 19:51:28 -0800 (PST)

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-03 04:51:32 CET

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