Branching / Merging Management in Subversion 1.5

I used subversion for some time and for some time used svnmerge.py script in my old work to manage merges between branches. I believe that Subversion 1.5 is now missing and should have integrated the branch / merge management system with it.

So, can someone give me a quick overview of how to track merges in a branch with Subversion 1.5? Are there any pitfalls using this support? Should I ensure that all teams are updated to 1.5 before using this support?

+5
source share
3 answers

Using

(svn: mergeinfo).

, , , :

svn merge trunkURL

, , , , (-).

- .

..

, .

, , :

  • : 1.5, .
  • : 1.x 1.5, , .

.

+4

:

, " , mergeinfo". -

svnadmin upgrade REPOS_PATH

REPOS_PATH - , .

+1

~ svn-merge.py, , svn XXX.

0

All Articles