[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merge branch to trunk problem

From: John Stokell <john.stokell_at_ultra-controls.com>
Date: Fri, 25 Oct 2013 09:00:53 -0700 (PDT)

I have attached a repository dump of a very simple repository which demonstrates the probelm we encountered on a production server.

A branch has been created, a file added to the trunk which was then merged to the branch and commited. A file is added to the branch and commited

Attempting to merge (a range of revisions) from branches/test_branch to trunk with an empty specific range (automatic merge) produces a tree conflict on trunk/folder1/file2.txt

Doing the same merge with the command line client produces no warning and the merge completes correctly.

This has been tried with both the current 1.8.2 32 bit build and also TortoiseSVN 1.8.2, Build 24884 - 32 Bit -dev, 2013/10/22 21:02:26

Both produce the same result.

Any ideas what is happening here?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2013-10-25 18:02:49 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.