Is it possible to Merge trunk and branch without pulling the source using Tortoise SVN?

I don't think this is possible, but that's a good thing. Do you really want a mindless, automated merge of all these sources (finished with a commit)? The point of merging in a local copy is so you can sanity check it all, and resolve all the conflicts you'll get if you have changes in the same place in multiple branches.

I don't think this is possible, but that's a good thing. Do you really want a mindless, automated merge of all these sources (finished with a commit)? The point of merging in a local copy is so you can sanity check it all, and resolve all the conflicts you'll get if you have changes in the same place in multiple branches....

I want it to be more like a absolute replace. But, if I delete the old source and use the Copy To option. Then, I'll lose old revision details.

I want the revision details of the old source for tracking the revisions. I'm not familiar with svn. Or Is it possible to retain the old revision details and delete the old source and move the new source?

– Prince Ashitaka Oct 27 '10 at 9:05 1 +1 Thanks. I end up delete merge. :) – Prince Ashitaka Oct 27 '10 at 9:29 not sure how much help I was, but I'm glad you got it sorted in the end mate, Dave.

– Dave Oct 27 '10 at 9:53.

As pointed out in this tortoise svn article ... merging always takes place within a working copy. You might use svn merge --accept theirs-full URL1 URL2 WCPATH in order to resolve all conflicts with the version from a given URL. Sources deleted with svn delete will still be part of the history.

1 Thanks for the point. – Prince Ashitaka Oct 27 '10 at 9:30.

No, what you're asking is not possible. Merging takes place in your working copy. There are several reasons why this it is a good idea to keep it this way: Conflicts may appear and must be dealt with.

Users usually build and test before committing new code, and should do so after merging as well. If the merge fails or if you do something stupid, you haven't messed up anything until you actually commit. If you have to merge 30+ sources, you're best choice is to automate things using the command line client.

This is how I would do it (in bash, you'll have to translate it to . Bat or whatever you're comfortable with): REPOS= \ ... \ ...For f in REPO; do svn co REPO/target svn merge REPO/source target svn commit -m "Merged target into source" target rm -r target done Tips: Use svn help to see how to invoke each of the svn commands. Use svn merge --dry-run without svn commit first, to make sure you can do the merge without any conflicts (svn commit will fail unless you resolve the conflicts first).

1 +1 Thanks yoda. --dry-run is such cool thing. You rock :) – Prince Ashitaka Oct 27 '10 at 10:02.

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.