RE: Unexpected results with merge

Vincent Thornley wrote:
> With the command line client I commit the changes. The editor
> opens for me to add the log message neither FileAaa nor FileAab
> appear in the filelist. In the commit report no mention is made
> of either file. However, when I browse the repository the files
> are listed with the revision numbers of the original files in
> Folder1/FolderAa.
>
> What is happening here? I can provide a more detailed script and
> results if required, but that will have to wait for some days
> since holidays beckon :)

One further peculiarity: When I do an update to the WC the files FileAaa and
FileAab do not appear in the WC. If I add new ones by the same name and
commit them an error occurs since they are already in the repository. The
only way to get them into the WC is to delete folder FolderAa and do an
update to FolderA.

--
Vincent Thornley
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org