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

Problem with commit after merge

From: <Christopher_Doloriert_at_Monitor.com>
Date: Wed, 9 Jul 2008 14:47:45 -0400

Hi:

I have encountered the following problem using TortioseSVN 1.5.0.13316 and
a 1.5.0 repository.

I created a copy B of subtree A using Copy To ... in the repo browser
I then created a working copy of A and a separate working copy of B using
Checkout ...
I added some folders and files in those folders to A and Committed the
change
I then Merged A to my working copy of B and Committed the change
I then modified files in the working copy of B and also added a file
I then Committed the changes to B

Then things went badly wrong.

1) I got the following error shown in the attached screen capture;
2) The Add appeared to have been committed correctly (even though the
error message said that the commit had failed)
3) The three modifications were committed to A instead of B (even though
the error message said that the commit had failed)
4) The working copy of B is corrupt, since it still thinks that the
changes have not been committed (as shown in the second attached screen
shot)
5) The final screen shot shows the log entry for the (supposedly failed)
commit. Working copy A corresponds to repo path
'Monitor.com/trunk/TeamSite/Monitor US/integration' and working copy B
corresponds to 'Monitor.com/trunk/TeamSite/Monitor US/UAT'

-----------------------------------

This message contains information that may be confidential and
proprietary. Unless you are the intended recipient (or authorized to
receive this message for the intended recipient), you may not use, copy,
disseminate or disclose to anyone the message or any information contained
in the message. If you have received the message in error, please advise
the sender by reply e-mail, and delete the message immediately. Thank you
very much.

picture picture picture
Received on 2008-07-09 21:37:10 CEST

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