Geek Answers Handbook

Subversion: subtree merging and merge tracking

Sent from Subversion function branch requires changes from another function branch

I have two branches of functions: "FeatureA" and "FeatureB". FeatureA is complete, but not merged with trunk, because it is not confirmed whether it should go in the next version or not.

FeatureB is running, and as it turns out, some changes to the dbml actually apply to FeatureA.

I have several options, one of which is to combine only dbml and related files. I know that it is best to merge / update / commit, etc. From the root of the working copy, but what problems can arise if I have to go further?

+5
source share
5 answers

In the end, I solved this problem by agreeing with my managers that if I had this problem, I would just create two functions in one branch, and they should come together and be tested together.

0
source

You can merge all the changes from FeatureB into the FeatureA branch you want (it’s a good idea to mark the merged versions, since subversion will not do this for you - the svnmerge.py tool does this, but I would rather keep the record myself). Then undo / delete the changes you do not want (for example, as you noted in the previous question, are part of the changes).

: ", FeatureA FeatureB trunk, , , , FeatureB". , . , / , FeatureA FeatureB, trunk?

, , , .

FeatureA. , FeatureA .

+1

, svn . , rev X rev Y, rev Z. , , .

, , , dbml Feature A ( ), Feature B.

0

, " mergeinfo". , . , . , , mergeinfo . , .

0

Since version 1.6 Subversion tracks mergers, you will not have any additional problems.

-1
source

More articles:


All Articles