SVN Mergeinfo properties on paths other than the working copy root

I have an SVN repository where I have trunk and a branch. I intend to merge the trunk into the branch at regular intervals, however, when I do this I see many property status changes, in addition...

Remove unnecessary svn:mergeinfo properties

When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I want to merge. Questions about this...

Easiest way to collect revision history since last merge in Subversion

I usually commit multiple changes to my branch and merge to trunk occasionally. I'd like to keep all my commit messages in the latest revision note of the final trunk merge. I don't want to...

Subversion: howto find all revisions that are not merged to trunk?

Branching sources for release cycle is one of common source management scenarios. Merging as soon as possible is a good practice. Thus we have a human factor: branch is closed, but someone forgot...

Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5

I'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I...

SVN mergeinfo property and branches

Here we go again with svn:mergeinfo. I have read all the Q/A regarding it but I have come across a case that does not seem to be covered in the existing posts here. My trunk is clean of...

How to merge with SVN server prior to 1.5 (retrieval of mergeinfo unsupported)?

Locally I've got TortoiseSVN version 1.6.11 installed. This is using Subversion 1.6.13 My central SVN repository uses version SVN Server version 1.4.2 (and I can't upgrade it). Every time I try to...

Is it possible to get svn client debug output?

I'm looking to enable extremely verbose logging output in the svn client specifically for the task of resolving botched merges. The problem I'm facing currently is merging from trunk into my...

svn: Querying mergeinfo requires version 3 of the FSFS filesystem schema;

I get this error when trying to query mergeinfo. $ svn mergeinfo --show-revs eligible https://svn.hq.corp/trunk https://svn.hq.corp/branches/RC-1 svn: Querying mergeinfo requires version 3 of...

Is there any other solution like 'svnbridge'?

I joined a new team which choose the tfs 2012 to manage source code, because it is upgraded from vss. But as I know, more team members like subverion. It is hard to use tfs in these a few mouths,...

Tortoisesvn skips recording mergeinfo

I have checked out the trunk from one of our svn repos. I then right click -> merge -> merge some revisions -> merge from branch A -> choose one revision and then finally apply the merge. My...

Merge info not getting recorded in mergeinfo property

I have merge code from a branch to trunk using SVN merge tool (not the svn merge command but using UI). I use TortoiseSVN. When I run following command svn propget svn:mergeinfo <<URL_to_trunk>>...

Problems with Linux SVN server

I have an SVN server running in my Redmine server. I have run the following to make sure I am up-to-date: apt-get update apt-get upgrade I am able to connect, update, commit, etc but I am...

How skip SVN commit of branch from trunk

I usually commit a patch on svn branch then merge it with trunk for synchronization. But now I have mistakenly commit a patch on trunk. Now I want to commit same patch on svn branch and then skip...

How does SVN choose the BASE revision for a merge?

According to the redbook, the merges from trunk to a branch are termed "sync merges". How does Subversion determine the BASE revision for the *second* sync merge? Let me explain. (This long...

How to use SVNKit to get the list of all revisions merged from one branch to another?

Purpose: As a quality check, we need to make sure that all qualified revisions are merged up to all higher revisions. Example: Release_10 --> Release_11 In TortoiseSVN, it is very easy to figure...

Tortoise 1.9: Merge does not record mergeinfo

I'm using Tortoise 1.9 as a SVN-client for a Apache Subversion Server 1.7. I realize that none of my merges are recorded to svn:mergeinfo. Neither "svn mergeinfo --show-revs" nor the Tortoise...

How to merge changes from Subversion Trunk to Branch and open editor to resolve conflicts

I am working on a svn branch and using the following batch file to get regular changes from Trunk into my branch. When conflicts emerge I want the batch file to open my merge editor when I choose...

How do I merge the creation of a single file in SVN?

I have an SVN revision which creates two files (and makes some other changes), but I only want to merge the creation of one of the files into my branch. If the file already existed, I could...

Why does IntelliJ think say that branches are no longer usable after merge?

I am attempting to merge changes from a Subversion branch into the trunk, using IntelliJ IDEA (version 2017.1). My current workspace is the trunk, and I used the instructions found here. But when...

svn: E175002: GET request returned unexpected delta base

Any clue how to debug or find cause of problem in title? Scenario: One of the users commit files to SVN repository(server on freebsd/apache dav/) using tortutisesvn(windows 8.1). Files he uploads...

git svn clone, mergeinfo are lost

We have a SVN setup which branch merge happens quite often. And I am currently trailing migrate to git. I am using svn2git for the migration, but I think the same does apply to git svn. It seems...

svn mergeinfo - E195016: "must be ancestrally related"

Although there are several similar questions here (e.g., SVN - Reintegration Merge error: "must be ancestrally related") and on the Web, I wasn't able to figure out why svn mergeinfo <file> causes...

Subversion reintegrate mergeinfo Reverse-merged - how to undo?

Hi We use 1.6 SVN client. We have 3 branches - trunk, branch A (created from trunk), branch B (created from A). Revision r1 of trunk is blocked (using --record-only) in branch A with...

SVN merge failing

I am using TortoiseSVN. The last time I merged trunk into my branch I had to merge some "mergeinfos", it was like a list of revisions with paths to single files. I selected the list with less...

How to svn merge two branches in command line

I checkout other people's branch. Inside, I do svn merge http://repo.com/apps/service/branches/my_branch http://repo.com/apps/service/branches/your_branch What is the correct way to do svn...

Convert an upgraded SVN repo from linear to sharded?

I had an SVN 1.4 repo with filesystem format 2. I moved it to a new server using hotcopy (couldn't dump/load due to many checksum errors in old revisions). After upgrade, "svnadmin info" gives the...

Tortoise SVN Checkout - Malformed XML No Element found

I have created a repository on a debian linux server: svnadmin create --fs-type fsfs myrepo This has created a folder here: /var/svn/myrepo If I create a folder on my Windows computer and...

svn merge error "must be ancestrally related" even if files were previously merged

Problem description I have a SVN repository for my scripts. Recently, I've noticed that most of my scripts have a lot of common fragments of code (i.a. parsing options) so I decided to create a...

Do three-way merges exist in Subversion?

I know there's the sync merge which copies over the next set of changes from trunk. According to the docs, this is how the sync merge works: Subversion will locate all the changes on 'trunk' that...