Re: Core dump while merging on 0.14.2

Eric Hanchrow <offby1@blarg.net> writes:

> svnadmin create $REPOS
> cd $(dirname $WD)
> svn co file://$REPOS $WD
> cd $WD
> echo Hey you > bob
> svn add bob
> svn commit -m ''
> svn cp bob bob-new
> echo A new line >> bob
> echo Another new line >> bob-new
> diff bob bob-new
> svn diff bob bob-new
> echo -e 'run merge bob bob-new bob-new \n bt ' > /tmp/gdb.$$

Hmm, merge converts the "source" arguments into URLs, and the added
file doesn't have an URL yet. The NULL URL that results causes a core
dump.

As far as I can see, although merge accepts working copy "source"
arguments, it appears to use them only for obtaining the source URLs.
Thus merge ignores any local changes in the working copy sources. Is
this how merge is supposed to work? It surprised me.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org