I'm sick and tired of manually tracking my branches and merges across my repository! It's too error prone. In a world where everyone seems to get the idea of reducing duplication and automating everything, subversion branching/merging feels like it's left over from the 80's. What is a good alternative to subversion that has excellent bra...
I got to thinking about how annoying messy merges can be and was wondering if there are any language aware diffing tools that go beyond the typical language-aware features of comment skipping and case sensitivity. Seems like the diffing engine could infer a lot more if it were aware of the syntax of what it is diffing instead of just tr...
Background: In my job, we use SVN, C# and VisualStudio. Part of my task regularly involves global renames. Often I end up with a broken build after renaming something and then merging in changes. The question: is there a solution out there that can look at my changes, notice the global rename and then apply that to the edit that others ...
Are there any more generic tools that can "compile" or basically merge multiple PHP files into a single file based on includes and autoloading classes? I'm thinking of something similar to Doctrine's compiling functionality or the compiling that many of the major JS frameworks do for "production" sites to lighten the file size and improv...
In my existing (Pre-SVN 1.5) merge strategy, we create a copy of the Trunk (called BasePoint) at the moment of branch-creation for referencing later during the merge. When we need to merge a branch back into the trunk, we perform 2 operations. Merge from BasePoint to LatestTrunk (Trunk has likely moved on since the original branch) in...
I thought I had figured out everything I needed to know about Subversion 1.5 and was happily merging between my feature branches and the trunk. Then I realized I've not been doing what I thought I had. I have not been using the --reintegrate parameter when merging back to the trunk from a feature branch. Specifically I use TortoiseSVN...
Hi, Our policy when delivering a new version is to create a branch in our VCS and handle it to our QA team. When the latter gives the green light, we tag and release our product. The branch is kept to receive (only) bug fixes so that we can create technical releases. Those bug fixes are subsequently merged on the trunk. During this t...
SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don't serve me very well. At the moment I'm using a combination of manual "svn merge" and the graphical diff Meld. Are there better alternatives (non-win32)? ...
If two users edit the same wiki topic, what methods have been used in wikis (or in similar collaborative editing software) to merge the second user's edits with the first? I'd like a solution that: doesn't require locking doesn't lose any additions to the page. It may add extra "boilerplate" text to indicate where differing changes we...
When I merge the trunk into a feature-branch, a delete that occurred on the trunk will not be replicated to my working copy. Why will a delete on trunk not delete the same file on a branch when merging? I'm using subversion 1.5 client and server. I'm assuming that changes to the file in the branch will be skipped when reintegrating th...
I have got 3 text files (A, B and C), each with several hundred email addresses. I want to merge list A and list B into a single file, ignoring differences in case and white space. Then I want to remove all emails in the new list that are in list C, again ignoring differences in case and white space. My programming language of choice is...
Currently I have two MediaWikis, one a slightly older version than the other. I want to merge the contents of both together, without eliminating duplicate pages. So far the best option I can think of is to use a bot (like pywikipedia) to go through all the pages of one wiki, and try inserting them into the other, renaming duplicate pag...
I have two branches, the main branch(black) and a feature branch(yellow). As you can see, since the feature branch was forked, it was kept up to date fetching changes from main: When I reintegrate back the feature branch to the main one, the log window shows this ugly graph: It shows each merge point as a new branch that was merge...
What would be the fastest way, to merge 2 XML files, so I would locate a node in first one, empty it, take all children from the same tag (same node) in second XML and put it in the first one. ...
I have two repositories which live on separate servers, call them repo-1 and repo-2. To start both "trunks" were equal: repo-1/trunk == repo-2/trunk Meanwhile changes were being commited to repo-1/trunk and I was working on and commiting changes to repo-2/trunk. Now I need to merge changes from repo-1/trunk into repo-2/trunk. I thou...
Hi. I don't have any experience with SVN and TortoiseSVN. In some stage of development we have received request to localize application for new customer. This is big task, and we decide to make branch for localization and continue development application without localization. Currently, localization is finished and we need merge this...
I'm storing several projects under the same SVN repository. I've followed the manual and did this: I svnadmin dump c:\repository | svndumpfilter include > myproject.dump My problem is, svndumpfilter chokes with the error "Invalid copy source path" because we moved that particular project from branches back to another folder awhile ago....
In an SSRS Report ,I have a table which has 14 columns, 1st column is 7am and the last column is 7pm. I have 100 records with conference names and the timings, ex: 1) interenational conference 9am to 5pm 2) national conference 8 am to 11 am so the problem is these column cells must merge based on the timings and siplay as one textb...
Hi, I hope this makes sense and apologies if this has been covered before. The situation: We do regular releases to a production environment. At least once every two weeks, but quite often there can be up to three releases in a week. We have a focussed team of 3xSE's, 2xWD, 3xQA and a Technical Manager/Lead (me). The team fluctuates de...
I have a problem with combining or calculating common/equal part of these two dictionaries. In my dictionaries, values are lists: d1 = {0:['11','18','25','38'], 1:['11','18','25','38'], 2:['11','18','25','38'], 3:['11','18','25','38']} d2 = {0:['05','08','11','13','16','25','34','38','40', '43'], 1:['05', '...