Merging into the working copy - Wrong URL

[GoogleCodeExporter]

Hi everyone,

I use SVNX 1.3.4 on Mac OS X.8 Mountain Lion.
I'm trying to drag a revision from a repository to a working copy window to 
merge it.
A merge configuration sheet appears but the source of the merge (Merge From) 
has the wrong URL.

My repository is : 
https://192.168.3.7/svn/datiming/trunk/

But in the Merge From field, there is : 
https://192.168.3.7/svn/datiming/

Did I do something wrong because the merge doesn't work.

Thanks for your help.

Original issue reported on code.google.com by stephane...@gmail.com on 12 Nov 2012 at 4:46

Attachments:

• svnX.png

[GoogleCodeExporter]

Stephane,

If you drag from a log entry (to a WC) you are asking svnX to merge or reverse 
merge a change (commit) to a repository.
This always implies that the source URL of the merge is the root URL of the repo
(as the change may contain paths outside of the currently browsed repo 
sub-path).
By default, this will attempt to (reverse) merge all the files that changes in 
the specified change (revision).

If you only want to (reverse) merge individual file changes:
    1. Select the target file of your merge in the WC window or deselect everything to let svnX choose the best match.
    2. Click the advanced (gear) button in the repo window (next to the search field) to show the paths list.
    3. Select the source log entry in the repo window.
    4. Drag the path of the file/folder that you want to (reverse) merge.
    5. Drop it in the WC window.
    6. Select/deselect Reverse Merge as required.
    7. Click Dry Run to see what will happen before clicking OK.
If there are multiple files then you can do the above for each.

Original comment by chris...@gmail.com on 12 Nov 2012 at 8:56

[GoogleCodeExporter]

Thanks for your quick answer.

I tried your solution, unfortunately, the merge still doesn't work.
I have a revision with two changes :
- Creation of a folder.
- Creation of a php file in this folder.

I dragged the first line in the WC window, the sheet appears, I click on OK but 
nothing happen. My new folder is not added. Same with the second line (creation 
of the PHP file)

And by the way, is it possible to merge a full revision and not file by file ?

Thanks again for your help

Original comment by stephane...@gmail.com on 13 Nov 2012 at 8:58

Attachments:

• svnx2.png

[GoogleCodeExporter]

In your screen shot you have the Reverse Merge button checked.  So you are 
asking svnX to UNDO the change.
If the change you are REVERSE merging creates a file or folder, and that item 
doesn’t exist in your WC, then you are unlikely to see any change to your WC.

If you click the Dry Run button then you can look in the Activity window to see 
the exact Subversion command line svnX uses.
You can then lookup the details of the command in the Subversion documentation.

> And by the way, is it possible to merge a full revision and not file by file ?

I’m not sure what you mean by “full revision”.
As I stated above “If you drag from a log entry (to a WC) you are asking svnX 
to merge or reverse merge a change (commit) to a repository.” — this is a 
delta between the selected rev & the previous rev (or vice versa).
Alternatively, if you drag from the repo browser you are asking svnX to merge 
from a file or sub-tree as it stood at that revision.
The radio buttons in the Merge sheet allow you to change the default behaviour. 
 Each displays a tool-tip.
If you are trying to merge from the trunk to a branch then you probably want to 
use either ‘Changes Since Revision:’ or ‘Differences With:’ and not 
‘Single Change’.
Have you read the svnX & Subversion merge documentation?

I do not believe that this is an svnX issue.

Original comment by chris...@gmail.com on 13 Nov 2012 at 3:35

[GoogleCodeExporter]

Original comment by chris...@gmail.com on 21 May 2014 at 1:04

• Changed state: Invalid