Merge Issue

[GoogleCodeExporter]

Problem Details:
 i was merging to ta trunk by a usual merge method of SVNX and then doing a dry-run which shows a tree conflict after that i merge the file and it shows it completed. but when i open the file i get the old version trunk file.

Original issue reported on code.google.com by tridi...@gmail.com on 13 Nov 2013 at 1:10

[GoogleCodeExporter]

I’m not sure I understand what the problem is.

What “usual merge method” did you use before “doing a dry-run”?
And why would you perform a merge before a dry run rather than after?
It’s quite possible for a Merge dry run to indicate that it will produce a 
tree conflict.
It’s possible, that if there is a tree conflict, that files will not be 
merged/changed as you had hoped.

You need to state what versions of svnX, Subversion (& possibly OSX) you are 
using; exactly what you did; exactly what happened and what errors & messages 
were displayed; and why/how that is different from what you think should have 
happened.

Original comment by chris...@gmail.com on 13 Nov 2013 at 5:48

[GoogleCodeExporter]

SVNX Version 1.3.4
SVN Version : 1.6
OSX: 10.7

i have created a repository for my test project with 3 folders: trunk,branches 
and tags.
i have added a text file in the trunk and did a check out to get my working 
copy. then created a branch for the file and again checked out from the branch. 
'

then i have changed the file with new contents and added one more file in the 
working copy folder and did a commit from SVNX.
Now when i am trying to do a merge by dragging the branch into the trunk 
working copy window, the merge screen appears and i have selected the "until 
revision  ..." options and the reverse merge options is unchecked. 
Then i performed a dry run and the window is showing the : 1 file added and 1 
tree conflict.
I have resolved the conflict but then too the file is not updated. 
Please clarify.

Original comment by tridi...@gmail.com on 14 Nov 2013 at 4:08

[GoogleCodeExporter]

Subversion 1.6 is a bit vague.  There were many ‘merge’ related bug fixes 
between Subversion 1.6.0 & 1.6.23.
There is no "until revision  ..." option in the svnX Merge sheet.

It’s common to use ‘Reintegrate’ or ‘Differences With:’ 
<branch-at-creation-or-last-merge> when merging a branch back into trunk.
Branching, adding a file & then merging should not produce a tree conflict.
What was the tree conflict & how did you resolve it?

SvnX’s Merge executes `svn merge [--dry-run] … <merge-from-URL> 
<into-WC-item>`.
The exact command can be seen by clicking the ‘info’ button in the Activity 
window.

Please show the merge command and its output.

Original comment by chris...@gmail.com on 14 Nov 2013 at 12:29

[GoogleCodeExporter]

[deleted comment]

[GoogleCodeExporter]

Subversion is now: 1.8 but still the problem is occurred. 

Original comment by tridi...@gmail.com on 18 Nov 2013 at 7:16

Attachments:

• [Screen Shot 2013-11-18 at 12.39.40 PM.png](https://storage.googleapis.com/google-code-attachments/svnx/issue-207/comment-5/Screen Shot 2013-11-18 at 12.39.40 PM.png)

[GoogleCodeExporter]

Your screen shot is not very helpful.

• Open the Activity window.  [Window > Activity]
• Select the last ‘merge’ or ‘dry-run’ Task item.
• Click the ‘info’ button.
• Select the command’s text and paste it into the comment box on this web 
page.
• Click the ‘log’ button.
• Select the output text and paste it into the comment box on this web page.
• Replace any passwords or private URL components with *’s or similar.

Original comment by chris...@gmail.com on 18 Nov 2013 at 7:59

[GoogleCodeExporter]

Thanx...Problem soled....

Original comment by tridi...@gmail.com on 28 Nov 2013 at 10:46

[GoogleCodeExporter]

Original comment by chris...@gmail.com on 21 May 2014 at 12:51

• Changed state: Invalid