Argh!
Who touched admin/cli/src/main/java/org/glassfish/admin/cli/resources recently?
As described in my previous messages, I'm about to move those files
to another module. Now I'm stuck with a tree conflict that I don't
know how to resolve with svn. I did something to make the conflict
go away, but I don't know if I got the right result. If you intended
to update those files, there's a good chance your update is lost.