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

Re: merge fails when target's directory of changed file removed

From: Chia-liang Kao <clkao_at_clkao.org>
Date: 2003-07-06 10:21:25 CEST

note that if the described merged with invoked with --dry-run,
it'll cause segfault due to the adm_access passed to svn_wc_merge
is NULL. I've had simple patch checking this, but still trying to
figure out why merge_file_changed of that entry is not called
without --dry-run.

On Sun, Jul 06, 2003 at 03:05:34PM +0800, Chia-liang Kao wrote:
> I'm not sure what behaviour should it be, maybe print a warning
> or so. but it shouldn't fail IMHO.
> I tried to fix it in merge_file_changed, because svn_wc_merge
> requires target to exist. but svn_repos_dir_delta only gets in
> merge_file_changed when dry-run is turned on.
> maybe someone familiar with the reporter/update_editor could
> fix this easily.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jul 6 10:22:17 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.