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

Re: [PATCH] Issue 838 merge should copy-with-history

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-08-08 08:14:19 CEST

Karl Fogel wrote:

>Branko Čibej <brane@xbc.nu> writes:
>>Oh blimey! This was caused by a bug in the status parsing regex in
>>svntest.tree.build_tree_from_status... And here I've already made a
>>head-shaped dent in the wall. Doh!
>But what about that wrong output from "svn merge" that you saw? The
>output with all the extra spaces after the `A'? That couldn't have
>been a python regexp bug, it has to be a Subversion bug, right?

That's sort of inherent in how Philip's patch works. It turns out Mike
was right -- it's caused by the way
libsvn_client/repos_diff.c:add_directory calls the notification
function. The only way to fix that is to teach svn_wc_add to DTRT during
a merge, which we all agree is non-trivial.

So, while this patch introduces a new feedback bug, it does fix the
fundemental brokenness of merge, which is that it doesn't preserve copy

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 8 08:14:50 2002

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.