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

Re: svn commit: r11479 - in trunk/subversion: libsvn_client tests/clients/cmdline

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-10-19 17:32:30 CEST

On Oct 18, 2004, at 5:52 PM, philip@tigris.org wrote:

> Author: philip
> Date: Mon Oct 18 17:52:24 2004
> New Revision: 11479
> Modified:
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/tests/clients/cmdline/merge_tests.py
> Log:
> Fix issue 1943. Track added directories during dry-run merges to
> allow the corect notification to be output.

Philip, you're my hero. This bug has been irritating me for so long.

I've read over the diff, and I can understand how it fixes the bug in
my reproduction script: that is, the case where 'svn merge --dry-run'
tries to add a new directory, as well as a new file within it.

But from my casual reading, it looks like the more general problem of
'svn merge --dry-run' showing deep, added subtrees isn't solved. I
mean, if 'svn merge' were to add a tree eight levels deep, would
'--dry-run' show everything? I don't see any
telescoping/de-telescoping of the new 'added_path' field happening.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 19 17:33:55 2004

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.