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

Test merge output differs from --dry-run

From: Kirk Haines <kirk.haines_at_gmail.com>
Date: Thu, 28 May 2015 16:06:32 -0700 (PDT)

Test merge is documented as having the same output as --dry-run in http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-cli-main.html, but differs.

I am using TortoiseSVN 1.8.13 on Windows 7. The use case this is following is creating a feature branch, keeping it in sync with trunk, and reintegrating it with trunk. This example is stripped down to the only sync pulling in a new blank file and the feature branch itself having no changes to make a smaller, clearer example.

I created a new repository with trunk, branches, and tags directories.
I created a branch, b1, from trunk.
I checked out a working copy of trunk via a file:///PATH_TO_REPO URL.
I created an empty file, a.txt.
I added a.txt.
I committed the working copy.
I switched the working copy to b1.
I merged trunk into my working copy ("Merge a range of revisions", left revision box blank for Merge revision range, used defaults for Merge options) without conflicts.
I committed the working copy.
I switched the working copy to trunk.
I started merging b1 into my working copy ("Merge a range of revisions", left revision box blank for Merge revision range, used defaults for Merge options) and hit the Test merge button to generate the following (summarized) output:
Command: Merging revisions 1-HEAD of file:///PATH_TO_REPO/branches/b1 into PATH_TO_WC, respecting ancestry, Test Only
...
Tree conflict PATH_TO_WC\a.txt
...

When running "svn merge ^/branches/b1 --dry-run -v", its output is only the following, which contains no tree conflicts:
--- Merging
--- Merging differences between repository URLs into '.':
 U .

If I check "Do reintegrate instead of automatic merge (old style)" in the Merge options page, then hit the Test merge button, it generates the following output:
Command: Reintegrate merge file:///PATH_TO_REPO/branches/b1 into PATH_TO_WC
Merging differences between repository URLs: PATH_TO_WC
Updated: PATH_TO_WC
: PATH_TO_WC
Completed!:

It seems that the test merge feature is not properly auto-detecting the merge type.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3119818

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-05-29 07:08:58 CEST

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