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

[PATCH] Tree conflicts - svn info reporting per victim

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Sat, 11 Oct 2008 20:16:18 +0100

Patch in progress, for any comments.

(Stefan, you were working on this some time ago, weren't you?)

The attached patch modifies the reporting of tree conflicts by "svn
info" so that "svn info path/to/victim" reports any tree conflict info
about the victim:

[[[
$ svn info path/to/victim
Path: victim
URL: [...]
[...]
Tree conflict:
The update attempted to edit 'pi'.
You have deleted 'pi' locally.
Maybe you renamed it?
]]]

instead of the current "svn info parent/" reporting a list of all tree
conflicts that apply to the target's children.

Problem (noted in the log message): in some cases the victim is not a
versioned object. This can happen legitimately when merging a
modification:

  M path/to/victim/child

into a branch in which the victim tree has been deleted. (It can also
happen at present due to a bug in which "update" proceeds to delete the
victim even if it is raising a tree conflict. I'm working on that.)

Also 2 tests fail. Info_tests 1 (seems to be partly due to a bug in the
test) and merge_tests 111 (needs to be updated to run "info" on the
victim).

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org

Received on 2008-10-11 21:16:52 CEST

This is an archived mail posted to the Subversion Dev mailing list.