Geek Answers Handbook

"Merge" a new file in the trunk to a branch

This should be trivial and obvious, but I cannot find examples of this. (I'm sure because I'm just looking for the wrong words.)

I need to merge a file from the trunk of my repository down to a branch. The file is new in the trunk and is not yet in the branch; so the usual way that I know to merge just doesn't work. Thus, I need to somehow get this new file in the branch.

I need to do this selectively with specific files; in other words, I don’t want to merge the whole chest, and I can’t even merge the entire list of changes.

Thanks for any suggestions.

edit - I understand that I can just copy the file from my workspace and svn addits branch, but I do not think that this is the "right" way to do this.

+5
source share
3 answers

You can do something like svn cp ^/trunk/file1 ^/branches/mybranch/file1to copy individual files from the trunk to the branch.

+10
source

The following command ignores any conflicts, overwrites old files and adds new files: Go to the TRUNK directory and merge it from the BRANCH:

svn merge - take them full

0
source

, . --depth .

:

svn merge -c 1234 --depth infinity ^/RING/trunk/exec/parent parent

1234 - , .

^/RING/trunk/exec/parent, . .

0

More articles:


All Articles