I'm very new to Subversion, but I've used other revision control systems like ClearCase for years. My boss asked me to fix this project so that it could be built with Maven instead of Ant. One of ...

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...

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 ...

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 merge...

Using the merge functionality in SVN (through TortoiseSVN) since a few month, I have the feeling that SVN reports way too often that a conflict occurs. So I am looking for a way to make (Tortoise)...

We have a repository running SVN. At some moment, to add a feature (lets call it 'branch'), we created a development branch from the main trunk (let's call it 'trunk'). We kept doing our work and ...

I am new to svn and need to do a lot of merging from trunk to a branch we are working from. This is the sequence of svn commmands I take to merge svn up svn mergeinfo --show-revs eligible branch ...

I am getting Tree conflict in SVN. It's weird! I have standard Trunk, Branches, Tags structure, and follow multiple team model. Branch1, Branch2 are created form Trunk and active parallely Steps ...

So long time user of SVN, but fairly inexperienced in branching / tagging, and when I have I suspect I'm not really using it correctly or to its full potential. I have my trunk which I work on add...

Within a pre-commit script, is it possible (and if so, how) to identify commits stemming from an svn merge? svnlook changed ... shows files that have changed, but does not differentiate between me...

I am a bit curious on how the merge info in Subversion is used, and what kind of problems one can run into if the merge info is incorrect? For example, I have branched branch1 and branch2 from tru...

Eclipse + Subversive plugin On commiting a directory which is out of sync with the SVN a message pops up: Merge conflict during commit svn: Commit failed (details follow): svn: File or directory ...

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...

I'm working with an svn setup I'm not used to and I need to merge new code from one branch to another. There's no code in the trunk folder so I don't know if I should update the trunk to the code...

I have created a feature branch off of the trunk for my project and the feature branch requires some project file configuration changes for it to work. When I merge the feature back to the trunk I ...

We run svn 1.6.x on both server and client. I branched, worked for several weeks, downmerged a few times, and then set out to upmerge back. svnmerge.py, as logged below, splits the commits into two...

How are you using svnmerge for merging and branching in svn? Specifically I ask because I have started using svnmerge to track a specific branch in a project I work on. I did svnmerge merge and en...

We have several large subprojects inside our main SVN project root. I commit and merge only my subproject when working with our release branches, mainly because it's faster. However, a colleague p...

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 inc...

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 ru...