SVN merge help: Created branch within a trunk?

Actually this is a bad practice to create a branch within trunk, but since this is done, there is a way to merge the code.

Actually this is a bad practice to create a branch within trunk, but since this is done, there is a way to merge the code... Do not merge the complete trees, rather merge the individual folders. Eg; If you need to merge back the branch into trunk, 1. Merge the REPO/Installer directory with REPO/Installer/Upgrade/Installer In this case, take a local checkout of the complete tree on your local system, and then go to the destination directory (where all the code is to be merged), in this case REPO/Installer/Upgrade/Installer Either use TortoiseSVN or merge by command line - svn merge http://svn.example.com/repos/REPO/Installer Once this activity is complete, I would suggest you to move the Branch to a separate location using svn move.

This can be done harmlessly while preserving all the history.

You can update your branch multiple times with the changes from the trunk. And it is as easy as running a merge command. Steps Check out a copy for your branch.

If you already have a copy of your branch downloaded, then make sure to submit whatever pending items you have in it. The update your branch to the head revision (svn update -r HEAD) just to ensure consistency. Then merge your changes from the trunk into your branch: svn merge svn.example.com/repos/trunk Running the command above will simply download the modifications from the trunk into your sandbox.

There you can review them, resolve any conflicts, and when ready.... Commit the modifications into your branch. Up to this point, you branch is in synch with the trunk. On the other hand, if what you want is to update the trunk with modifications from the branch, then you must be really careful.

This is called a reintegration, and can only be done once. That is, once you reintegrate your branch to the trunk, you will not be able to run this process again. Steps Check out a copy of your trunk.

If you already have a copy of the trunk in your sandbox ensure to submit whatever pending changes you have. Synchronize your branch to the latest changes from your trunk as explained in other recipe above. Ensure to update to the latest head revision (svn update -r HEAD).

Then reintegrate the branch into the trunk: svn merge --reintegrate svn.example.com/repos/my-branch Running the command above will simply download the modifications to your sandbox. There you can review them, resolve any conflicts, and when ready.... Commit the modifications in your trunk. Up to this point, you trunk is in synch with your branch, but your branch is useless, you might just as well delete it.

If you want to continue working in branch, you will have to create a new branch for this matter. If you do not intend to invalidate your branch, then your only solution is to create patch files with the differences and ensure both code bases are equal or manually copy the modifications.

While I appreciate the answer, and it's got some helpful information, it's not really an answer to my question. I've got a branch within my trunk. If I try to merge into the branch, it adds the whole branch into itself.

And if I try the reintigration, I get an error because the branch folder doesn't exist within the branch. – FellowMD May 31 at 19:46 1 @FellowMD It is true that is terribly bad idea to have a branch within the trunk, but the thing is that for SVN these all are just folders and therefore, you could follow the approach I stated above for every folder of your trunk (installer, utilities, main) and merge them individually. – edalorzo May 31 at 20:45 Ah that sounds like a solution.

I'll give that a go. Thanks! – FellowMD May 31 at 21:03.

In a working copy of the branch, merge the revision that updated A.cpp. Alternatively, if you have no local branch changes you need to preserve, you could just svn copy A. Cpp from trunk and overwrite your local A.cpp.

In a working copy of the branch, merge the revision that updated A.cpp. Alternatively, if you have no local branch changes you need to preserve, you could just svn copy A. Cpp from trunk and overwrite your local A.cpp.

Example cd workingCopyOfX svn merge -r50:51 my.repo.com/trunk/A.cpp assuming the fix was made in r51.

Depending on what platform you are on depends on how this is shown in the interface, but you should just be able to right click on the file and select merge, or deselect the files that you do not want to merge in the interface. If you are working on a command line environment then you should just be able to run svn merge and type in the filename. More details (although old I believe they're still relevant) can be found here.

There're probably many ways but I find it easier to do it this way: Go to a fresh (unmodified) working copy of target (X branch) Merge the whole revision from source (trunk) into your working copy Inspect local changes: revert unwanted changed files and maybe do some manual edits in wanted files When you're happy, commit.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.