LumpN Posted June 28, 2014 Report Share Posted June 28, 2014 I get the following error after "cm merge --merge --mergetype=forced --keepsource cs:2180" > cm ci --update --all -c="Merged from main" . The selected items are about to be checked in. Please wait ... Assembling checkin data Validating checkin data Revision 215594 not found in repository 8. The most recent revision in the repository is about 2200. I have no idea where 215594 comes from. Probably both the workspace and the merge are messed up. Is there a way to repair the workspace again? Link to comment Share on other sites More sharing options...
manu Posted June 30, 2014 Report Share Posted June 30, 2014 I think this is related with http://www.plasticscm.net/index.php?/topic/2277-out-of-sync-after-connection-loss/ and your workspace in a weird status. To repair your workspace: 1) Undo all the changes. 2) Close the GUI 3) Delete the .plastic\plastic.wktree 4) Run an update operation. 5) Check if you have .private* files, they are files that are stored by plastic with that special name (*.private.*) because the Plastic SCM client needs to download the right file revision and there's already another one holding that place so it's like a backup just in case... Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.