Account Options

  1. Sign in
The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Google Groups Home
« Groups Home
Working copy broken after failed merge
There are currently too many topics in this group that display first. To make this topic appear first, remove this option from another topic.
There was an error processing your request. Please try again.
flag
  1 message - Collapse all  -  Translate all to Translated (View all originals)
The group you are posting to is a Usenet group. Messages posted to this group will make your email address visible to anyone on the Internet.
Your reply message has not been sent.
Your post was successful
 
From:
To:
Cc:
Followup To:
Add Cc | Add Followup-to | Edit Subject
Subject:
Validation:
For verification purposes please type the characters you see in the picture below or the numbers you hear by clicking the accessibility icon. Listen and type the numbers you hear
 
Wayne Johnson  
View profile  
 More options Apr 26 2012, 1:50 pm
From: Wayne Johnson
Date: Thu, 26 Apr 2012 10:50:14 -0700
Local: Thurs, Apr 26 2012 1:50 pm
Subject: RE: Working copy broken after failed merge

http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessag

> eId=2953058

> To unsubscribe from this discussion, e-mail: [users-
> [email address]].

This sounds suspiciously like a problem we have seen with subversion for
some time (since at least 1.5.) We have been able to fix the working
copy by deleting the folder containing the file and then doing an
update. Of course you may have to revert the merge since all files in
that directory will be reset to the pre-merged state.

Wayne

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...

To unsubscribe from this discussion, e-mail: [[email address]].


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
End of messages
« Back to Discussions « Newer topic     Older topic »