[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: <cmpilato_at_collab.net>
Date: 2002-08-07 22:17:23 CEST

=?UTF-8?B?QnJhbmtvIMSMaWJlag==?= <brane@xbc.nu> writes:

> cmpilato@collab.net wrote:
> >>A working_copies/merge_tests-2/A/C/Q
> >>A working_copies/merge_tests-2/A/C/Q/bar
> >>A working_copies/merge_tests-2/A/C/foo
> >>
> >>
> >
> >There are two different feedback calls to use 'A'. One has enough
> >space to insert an optional "(bin)" and is used when adding and
> >importing a file or dir. That is, it will show one of these:
> >
> > A working_copies/merge_tests-2/A/C/Q
> > A (bin) working_copies/merge_tests-2/A/C/Q
> >
> >The other is used by updates and merges, and doesn't have the optional
> >"(bin)" stuffs.
> >
> >I'm guessing we're using the wrong one for the merge.
> >
> Yeah, I figured it would be something like that, but why is the wrong
> feedback call used only for the dir merge, not for the file merge? It's
> even happening in the same call to svn_client_copy: Q and Q/bar are
> added with _one_ call.

I may be looking in the wrong place (got too many stackframes going
already to add another gdb session to it), but I just noticed that in
repos_diff.c, add_directory uses svn_wc_notify_add (which should do
the extra spaces), while close_file uses svn_wc_notify_update_add
(which should not).

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 7 22:15:05 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.