svn-merge

Backstory : Got a job as an entry level web developer. Head developer leaves right when I start. All responsibility on me. Never used SVN. Going in blind. Problem : I keep getting errors like 'svn://svn/svn/xxx/project_name/branches/dev@330' must be ancestrally related to 'svn://svn/svn/xxx/project_name/trunk@326' The process by which I am starting the new project is: Make a directory for the project on my computer with subfolders: project_name/branches project_name/branches/dev project_name/tags project_name/trunk Right click the project root, select my project root, and Add it to the

I have a project with with the following structure ^/project/trunk ^/project/branches/mybranch where current HEAD is revision 1048. The branch was copied from trunk in r523. trunk has been merged to mybranch with the result being r1048. The mergeinfo on ^/project/branches/mybranch gives /project/trunk:523-1047 and the mergeinfo of trunk has no record mentioning anything from ^/project/branches/mybranch . Actually in reality both trunk and branches also hold mergeinfos from branches parallel to mybranch but those mergeinfos appear as absolutely identical in both outputs. Now I go into my

I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the end it shows so many conflicts. All I want is over-write complete branch on my trunk. Surely a possible way is to branch out from my branch but then my trunk becomes useless ! Also, while doing svn merge can I give an option so that for all conflicts it takes a particular value ( in this case Full-theirs ) and I dont have to type it always for all the conflicts. Pass --accept=theirs-full to the svn

I'm trying to use svnmerge.py to merge some files. Under the hood it uses python, and when I use it I get an error - "The system cannot find the file specified". Colleagues at work are running the same version of svnmerge.py, and of python (2.5.2, specifically r252:60911) without an issue. I found this link , which describes my problem. Trying what was outlined there, I confirmed Python could find svn (it's in my path): P:\>python Python 2.5.2 (r252:60911, Feb 21 2008, 13:11:45) [MSC v.1310 32 bit (Intel)] on win32 Type "help", "copyright", "credits" or "license" for more information. >>>

We have a branch B1, and it is still not stable yet so it is not in trunk. But we want to work with changes from B1 so we create a branch B2 from B1. So svn copy was done as follows svn copy http://svn/trunk http://svn/B1 svn copy http://svn/B1 http://svn/B2 After some days, B1 will be stable and B1 will be reintegrated to trunk. Now, the problem lies with merging back of B2 to trunk. Do we reintegrate B2 back to B1 and then reintegrate to trunk or directly reintegrate B1->trunk and B2->trunk? Since you stated that you created B2 just to have the latest and greatest changes from B1, then I

I had a problem with committing changes after merging two branches of my project using TortoiseSVN. Here are details: I did a merge branch to trunk of project which I am working on. Project includes main repository and libraries joint to main repository as svn external (libraries are also branched) as subdirectory of project . When I was trying to commit changes TortoiseSVN said: Commit A re all the targets part of the same working copy? Unable to lock 'D:\websites\project\lib' Please execute the "Cleanup" command. Of course Cleanup didn't help. svn:external keyword for project directory was