Geek asks and answers

Record only svn union information

We are changing changes from trunk to branch. While we do this, information about the merger is recorded.

Since there may be other changes in the branch, is there a safe way to commit only files affected by the merge (assuming there are no other changes) along with the / info merge properties?

“Suppose I want to merge the revision“ r1 ”from trunk to branch. I am merging from trunk to branch for“ r1. ”Now for“ r1 ”merge information is written in the branch folder. I do svn diff in the branch, it shows '.' changed and shows that "r1" is part of the merge properties. Now how can I commit files modified only by the merge "r1", as well as the merge properties that say "r1".

+5
source share
2 answers

If you use SVN clients, such as TortoiseSVN, during normal merge it is mergeinfoautomatically updated as a property of the root folder folder, and it will list the folder with the property change during the fixing of the file list.

, , , TortoiseSVN ( root , mytask , subtask programs ):

  • programs mytask TortoiseSVN-->Properties.

  • , mergeinfo , svn:mergeinfo , :

    /: 1-489

    //mytask///: 380-410

    :

    a) Edit → Advanced , svn: mergeinfo mergeinfo, , "".

  • , mergeinfo, :

    a) New-->Advanced.

    b) svn:mergeinfo , mergeinfo .

  • SVN, programs, programs , .

, , . (, copy1 copy2) (mytask) :

  • copy1 ,
  • SVN copy2 .
  • copy2 . , mergeinfo, .
  • copy1, SVN . ( , , SVN). , .
+1

, - stackoverflow, : 'svn commit --depth = empty folder_with_mergeinfo merged_files'.

, "svn ci branch", , . --depth = empty , , .

+1

More articles:


All Articles