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

Unexpected results with merge

From: Vincent Thornley <vthornley_at_iee.org>
Date: 2004-08-27 14:56:08 CEST

I have the following structure in my repository:

Folder/
  Folder1/
    FolderAa/
      FileAaa
      FileAab
    FolderAb/
      Files ...
  Folder2/
    FolderAb/
      Files ...

Folder Ab exists in Folder1 and in Folder2. Folder2 was originally copied
from Folder1, but since then changes have occurred in Folder1 and I wish to
merge these changes into Folder2. I carry out the merge and the structure in
my working copy is now as follows.

Folder/
  Folder1/
    FolderAa/
      FileAaa
      FileAab
    FolderAb/
      Files ...
  Folder2/
    FolderAa/
      FileAaa
      FileAab
    FolderAb/
      Files ...

However, I don't wish to include the files FileAaa or FileAab in the changes
when I commit them so I revert these files. The files still remain in the WC
folder but no longer have 'Added' status. I delete them from the working
copy.

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 :)

Server 1.1 RC1 on Windows, client 1.1 RC1 on Windows.

--
Vince
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 27 14:56:35 2004

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