Questions tagged [merge-tracking]
11 questions
26
votes
2 answers
How do I use the new SVN merge-tracking?
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…
Rory Becker
- 15,551
- 16
- 69
- 94
16
votes
4 answers
What am I doing wrong with SVN merging?
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…
RandomUsername
- 163
- 1
- 2
- 7
9
votes
2 answers
Is SVN 1.5 Merge-tracking ready for prime-time?
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…
Rory Becker
- 15,551
- 16
- 69
- 94
4
votes
2 answers
Can Subversion properly handle merges in both directions (trunk <-> branch)?
As far as I understand, the most common (and recommended) way to handle branching & merging in Subversion is:
create branch as a copy of trunk
do disruptive development on branch, and regular development on trunk
While doing so, regularly merge…
sleske
- 81,358
- 34
- 189
- 227
4
votes
1 answer
How should one use the svnmerge workflow with Mercurial?
svnmerge helps to block some changesets from a specific branch. How can this be achieved with Mercurial?
user134843
- 133
- 1
- 5
2
votes
4 answers
Preventing working copy out of date when using SVN merge tracking
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…
bwarner
- 872
- 1
- 5
- 12
2
votes
1 answer
How to enable subversion merge tracking
How do I enable svn client to start saving svn:mergeinfo property.
My client is v1.6.5 and the server runs 1.5.2.
drury
- 21
- 1
1
vote
1 answer
How to reintegrate with automatic merge (merge-tracking) in TortoiseSVN 1.8
I've read both these release notes for SVN 1.8 and this question concerning reintegration of a branch with SVN 1.8.
My questions, which I couldn't find an answer to, is the following:
Is there any difference between choosing
all revisions
specific…
Joerg
- 790
- 2
- 10
- 23
1
vote
3 answers
SVN: Track merges
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).
FoxyBOA
- 5,788
- 8
- 48
- 82
0
votes
2 answers
Looking for a Document Comparer that can generate difference reports
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…
Firoso
- 6,647
- 10
- 45
- 91
0
votes
2 answers
Why does TortoiseSVN (1.5.3) try to merge 1-Head when I pull from trunk?
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…
Rory Becker
- 15,551
- 16
- 69
- 94