nagyist / svnx

Automatically exported from code.google.com/p/svnx
0 stars 0 forks source link

Merging into the working copy - Wrong URL #190

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago
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:

GoogleCodeExporter commented 9 years ago
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