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

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

Notice the bunch of spaces between the "A" and the path in the first
line. Later on, the tree comparator dies with:

EXPECTED OUTPUT TREE:
ROOT
  +-- working_copies
        +-- merge_tests-2
              +-- A
                    +-- C
                          |-- Q
                          +-- foo
ACTUAL OUTPUT TREE:
ROOT
  |-- working_copies
  | +-- merge_tests-2
  | +-- A
  | +-- C
  | +-- foo
  +-- opies
        +-- merge_tests-2
              +-- A
                    +-- C
                          +-- Q
                                +-- bar

Does anybody have a clue where those spaces are coming from? The merge
seems to work correctly, it's just that the output is hosed. Something
to do with the trace callbacks, I guess.

-- 
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