Hi, I'm experiencing a tree conflict in a situation where there should be no conflict. Basically, after removing the contents of a directory I'm unable to commit deleting the directory even though no one has modified it. The client is 1.6.6. I've tried with server versions 1.4.3 and 1.6.9. Below is a simple demonstration
$ mkdir foo $ svn add foo/ A foo $ svn commit -m "Add dir foo" Adding foo Committed revision 1738. $ echo 'Hello World' > foo/bar $ svn add foo/bar A foo/bar $ svn commit -m "Add file bar in dir foo" Adding foo/bar Transmitting file data . Committed revision 1739. $ svn rm foo/bar D foo/bar $ svn commit -m "Remove file bar from dir foo" Deleting foo/bar Committed revision 1740. $ svn rm foo/ D foo $ svn commit -m "Remove directory foo" Deleting foo svn: Commit failed (details follow): svn: Item '/puppet/foo' is out of date $ svn update C foo At revision 1740. Summary of conflicts: Tree conflicts: 1 At this point, I have to use 'svn resolve --accept working foo/' to accept the deletion. Afterwards, I can successfully commit it. Can anyone explain this behavior? -- Brian Pitts Systems Administrator | EuPathDB Bioinformatics Resource Center 706-542-1447 | b...@uga.edu | http://eupathdb.org
