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

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

> Philip Martin wrote:
>
> >Hello
> >
> >Issue #838
> >
> [snip]
>
> >* subversion/tests/clients/cmdline/merge_tests.py
> > (add_with_history): New test. Half the Python doesn't work :-(
> >
> >
>
> Philip, I think I sort of figured out what's wrong with the test. Almost
> nothing. :-) , but the output of the "svn merge" is a bit weird now;
> here's what I get after instrumenting the test code:
>
> 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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 7 21:58:48 2002