CODEWITHSUNDEEP
svntortoisesvn
Ricky
Ricky

Reputation: 35963

SVN: Inquire usage practice

Our team creates sole bug-branch, from trunk, intended for bugs-fixing; verifying on PROD, we need to merge codes back into trunk. (We don't preferr creating one new branch per bug reported)

Our current practice is that using WinMerge compares sb's modification in bug-branch with counterparts in trunk, and merge. However, manual intervention - e.g., find what files you amended - sometimes makes mergence go wrong, e.g., forget files being merged.

I'd like to know how you use SVN or other tools to faciliate the process?

Upvotes: 1

Views: 92

Answers (2)

Scoregraphic
Scoregraphic

Reputation: 7200

Consider reading this (if you don't know yet): http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.3

Upvotes: 1

Wim
Wim

Reputation: 12092

What do you mean 'find what files you amended'? Simply merge the whole bug-branch back into the trunk using TortoiseSVN. Subversion will know which files you modified in your bug branch and which are untouched.

Upvotes: 1

Related Questions