I'm already using SVN 1.5, both sever(VisualSVN 1.5.1) and client-side(TortoiseSVN 1.5.1) but we are using a fairly lengthy SVN Branch-Merge dance. How ready is the Merge-Tracking facility of SVN 1.5.x and is it yet possible to use it from TortoiseSVN? ...
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 use TortoiseSVN 1.5.3 and VisualSVN 1.5.3 (Subversion 1.5.2) Suppose that I create a new branch (/branches/branch1) of the trunk(/trunk) then someone (also using TortoiseSVN 1.5.3) merges their branch back into the trunk. I try to merge from the trunk into the branch (to aquire all changes which might have beemn merged into the trun...
I've been using an application called "WinMerge" lately for document comparisons, but one of the requirements of my teams script files (for auditing purposes) is that when we release a revision of a script we highlight the changes in red (RTF format I believe, it's through Lotus Notes) To that end, is there any software that can automat...
When using the merge tracking feature in Subversion 1.5, SVN updates the mergeinfo property of the parent folder to track the revisions being merged. We have a large number of developers (>500) working on our repository, and it is not uncommon around deadlines to have large numbers of developers all trying to commit around the same time...
Is it possible in SVN 1.6 to track where a commit was merged. I'm especially interesting in UI based solution (Eclipse plugin will be great). ...
svnmerge helps to block some changesets from a specific branch. How can this be achieved with Mercurial? ...
When SVN with merge tracking works, it's really nice, I love it. But it keeps getting twisted up. We are using TortoiseSVN. We continuously get the following message: Error: Reintegrate can only be used if revisions 1234 through 2345 were previously merged from /Trunk to the reintegrate source, but this is not the case For ref...