RE: Problems with merging

On Windows I would recommend TortoiseSVN, it has an excellent merge

________________________________

From: Jonathan Prince [mailto:[email protected]] 
Sent: Wednesday, December 23, 2009 5:04 AM
To: [email protected]
Subject: Problems with merging



I'm evaluating SubVersion for our development team.

I've been using Rapid SVN (v0.12.0 r8051 on Windows) as a front end and
the basics all seem to work very well.

No problems with setup, commits, history, diffs, copying (i.e. branches)
etc.

 

I'm now looking at merging (between a branch and the trunk) and really
struggling.

Firstly the merge tool (I'm testing KDiff3, specified under
View->Preferences->Programs) never appears.

Secondly when I ran a merge it picked the older version to use and there
was no opportunity to view the merge before it happened.

 

Does RapidSVN use the merge tool or some internal code? Is there any way
to view the merge before it is applied?

Am I doing something wrong? Is any of this changed in the next release?

 

(BTW I found the merge dialog quite unhelpful. It would really benefit
from file/folder dialogs and drop downs for revision numbers)

 

 

Jonathan

SDL PLC confidential, all rights reserved.
If you are not the intended recipient of this mail SDL requests and
requires that you delete it without acting upon or copying any of its
contents, and we further request that you advise us.
SDL PLC is a public limited company registered in England and Wales.
Registered number: 02675207.  
Registered address: Globe House, Clivemont Road, Maidenhead, Berkshire
SL6 7DY, UK.

This email (including any attachments) may contain information which is privileged, confidential, or protected. If you are not the intended recipient, note that any disclosure, copying, distribution, or use of the contents of this message and attached files is prohibited. If you have received this email in error, please notify the sender and delete this email and any attached files.

------------------------------------------------------
http://rapidsvn.tigris.org/ds/viewMessage.do?dsForumId=671&dsMessageId=2432672

To unsubscribe from this discussion, e-mail: [[email protected]].