Re: tree-conflicts: dirs_same_p()

Julian Foad wrote:
> Next thing I notice is that the test suite says:
>
> [[[
> $ svn-py-test merge 122
> Couldn't find node 'psi.tmp' in expected disk tree
> * Node name: psi.tmp
> Path: __SVN_ROOT_NODE/psi.tmp
> Contents: This is the file 'psi'.
>
> Properties: {}
> Attributes: {}
> Children: None (node is probably a file)
> =============================================================
> Dry-run merge altered working copy
> =============================================================
> [...]
> ]]]

Is that related? Remember that 122 has now become 123, because a test has
been added on trunk as 122. The tests you told me about are now 123 124 125.

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194