All geek questions in one place

Does svnmerge really help me?

This post may be a little long, but if you think you can help, read it because it will literally be a lifesaver.

Here is the script. I am working on a project [for KDE] whose trunk is located in, say: http://ubersvn.org/home/uber/trunk/myapp . In addition, I am working on a branch, say: http://ubersvn.org/home/uber/branches/work/myapp-mod . This is what I did:

After creating the branch, I worked on my entire local working copy of the branch, and I often used to pull changes from the trunk. I was told that this will help prevent conflicts when it comes to the final merger with the trunk. So, quite often I did:

svnmerge.py merge
svn commit -F svnmerge-commit-message.txt

After the work has been completed, it is time to merge the branch back into the trunk. First I checked the working copy of the chest:

svn co svn+ssh://ubersvn.org/home/uber/trunk/myapp
cd myapp

Then I completed the documentation for merging back:

svnmerge init svn+ssh://ubersvn.org/home/uber/branches/work/myapp-mod

And combine back and forth:

svnmerge merge --bidirectional -S svn+ssh://ubersvn.org/home/uber/branches/work/myapp-mod

And here the problem begins. Firstly, from the look of it, it combines every single revision since I am branched. If he does this, I don’t see that I often had problems removing the trunk and updating my branch. However, I just assume that svnmerge is somehow using it to resolve conflicts during a merge. So far so good.

Secondly, it ended abruptly with an error that sounds like something like:

Attempt to add tree conflict that already exists

A little internet search told me that the problem could be solved:

svn resolve --accept working -R .

, . , :

svnmerge merge --bidirectional -S [BRANCH_URL]

: " svnmerge found". svnmerge init BRANCH_URL, , '.' has local modifications. It must be clean.

, , , :

  • ,
  • , , , , .
  • . , , , "mylittleapp.h", "mylittleapp.h" .
  • ** ** ** ** , . ** ** . , , . ?
  • , `mybigapp.h.merge- ( | ).r [0-9] +` `mybigapp.h.working`. `mybigapp.h` . , - .
  • , , -, . - " ".

, ? , , , , . , , . , .

,

+3
1

, , .

, . , .

rev 5: created my-branch
rev 6: change 1 in my-branch
rev 7: change somefile.h in trunk
rev 8: change 2 in my-branch

, , 7 ! all . , , SVN mergeinfo (SVN 1.5) (, ). :

svn: mergeinfo/trunk: 7, 10-13, 14 ( , )

. , svn delete, somefile.h trunk, .

:

, . , , - , , SVN, , .

+2

Source: https://habr.com/ru/post/1765407/

More articles:


All Articles