[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn merge segfaults

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2003-10-20 11:13:12 CEST

Ben Collins-Sussman wrote:

>>>No, 'svn merge' isn't a "smart" command. It just applies tree-diffs
>>>to a working copy.
>>Yes, but the source=target case might be worth checking.
> Why? Sometimes it's totally legitimate for source and target to be
> the same URL. Suppose you have a working copy of trunk, and you're
> simply trying to undo a commit you just made:
> svn merge -r HEAD:HEAD-1 http://repos/trunk
Yes, you're right, but I think, that the 90% case is that you do not
want source=target. It would require one or three extra keystrokes from
the user, but it would make subversion a bit safer to use.
    svn merge -r HEAD:HEAD-1 http://repos/trunk
    "Warning: Source and target are identical, proceed with operation?

    svn merge -f -r HEAD:HEAD-1 http://repos/trunk
would suppress the question.

I'm sure that the svn developers are aware, that many (some/most?) users
of subversion are command-line-illiterates and *will* make these mistakes.
I consider myself quite capable of using the cl client, but I discoverd
this crash only, because I was accidentally merging with source=target.

Checking and asking a question doesn't harm anyone, but might prevent
doing harm.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 20 11:14:06 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.