svn-merge

问题 I have source files managed in SVN using TortoiseSVN. I had added files and committed them to a revision, and subsequently decided to branch. I branched with the files I needed, and performed a delete on the trunk of the files that wasn't intended to be used. Now I'm attempting to reintegrate the branch to the main trunk. Using tortoise, I have merged from trunk to branch the range of revisions from AFTER the delete on the trunk to head. This brings the branch up to date. Now I switch to the

问题 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

问题 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 pointed out this reference to merging subdirectories in Version Control with Subversion (a.k.a "The SVN Book"): For long-lived release branches (as described in the section called “Common Branching Patterns”), perform merges only on the root of the branch, not on subdirectories. Unfortunately, this is

问题 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 followed: 1. Branch1 Work : newfile.c added and committed in Branch1 2. Merge : From Branch1 -> Trunk (successful; file added in trunk) 3. Merge : Down-merge from Trunk -> Branch2. (successful; file added in Branch2) 4. Branch2 Work : Perform regular Branch2 work and commit. 5. Merge : From Branch2 to

问题 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 merges and manual edits. Ideally, I would also like to differentiate between a standard merge and a merge --reintegrate . Background: I'm exploring the possibility of using pre-commit hooks to enforce SVN usage policies for our project. One of the policies state that some directories (such as /trunk )

问题 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 sets, and on the second set, encounters a (false?) tree conflict, and then gets a subversion error and implodes (see the bottom of the log). I'm loathe to commit this in two parts, since the intermediate state was not really working, so manually running the first revision set and then the second is

问题 As we know, TortoiseSVN creates svn:mergeinfo as a folder property if the merge is performed at that folder level. This could be a top folder (such as trunk ) or some sub folder. I always thought that it was OK to merge at sub folder level since the svn:mergeinfo on the sub folders would be used when merging at the top folder level. I think that it was generally working for me as well in the past, until today when I saw a case that I could not explain. I saw a merge at sub folder level from a

问题 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 trunk . I also have a subbranch1 and a subbranch2 originating from branch1 . Consider I've done some development in branch2 , and then reintegrated it back to trunk using svn merge --reintegrate ^/branch2 . I then wanted to add these changes to subbranch1 as well (pulling them from trunk ) and

问题 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

问题 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