Re: merge in RapidSVN has different results than with command line

To make a long story short: merging is RapidSVN's weakest feature now. 
Seems like few people actually use it (otherwise we would have plenty of 
bug reports and/or patches). If you take the options for merging and the 
options for the svn commandline alone you see RapidSVN only has a very 
minimal subset of the available options and the one implemented isnt a 
typical usecase (in contrast to the default behaviour of the svn 
commandline).

Am 09.03.2011 01:07, schrieb [email protected]:
> I've been using svn in a linux environment from the command line for a while and some of my windows using co-workers want to get on source control bandwagon. We've chosen to use RapidSVN because the client exists for Mac, 'nix and Windows.
>
> I'm running into a problem with merging.
> When I merge from the command line, additons, deletions and modifications all end up in my target copy.  However, not so with RapidSVN.
>
> Firstly, in the log message window, it only shows updates, when I know that there should be additions (new directory with files).
> Secondly, none of the files are actually modfied, either on the filesystem or in the RapidSVN right hand pane.
>
> I suspect that it might be user error, because the information you pass to RapidSVN for a merge is a little different than you do with svn from the command line.
>
> This is what I've been doing.
> 1) updating both the working copy of the branch and trunk
> 2) entering the path for the working copy branch in the first working copy box, with the latest revision as shown in the Log
> 3) entering the path for the working copy trunk in the second workign copy, with the lastest revision as shown in the log
> 4) entering the path for the working copy trunk in the destination path
> 5) keeping recursive checked
>
> When I click OK, the log message reports
>
> Execute: Merge
> Updated: /tmp/trunk/control/xxxxx.ctl
> Updated: /tmp/trunk/control
> Updated: /tmp/trunk/bad
> Updated: /tmp/trunk/bin/xxxx.lst
> Updated: /tmp/trunk/bin/xxx.ksh
> Updated: /tmp/trunk/bin
> Updated: /tmp/trunk
> Updating...
> Ready
>
> But none of the additions (new directory and files show up).  Then if I check the status with the command line, these files don't show up as modified...
>
> Is this user error on my part or is the "merge" in RapidSVN supposed to perform differently than a svn merge command?
>
> Thanks for your help.
>
> ------------------------------------------------------
> http://rapidsvn.tigris.org/ds/viewMessage.do?dsForumId=671&dsMessageId=2710308
>
> To unsubscribe from this discussion, e-mail: [[email protected]].

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

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