I bumped into a similar situation again, and my conclusion is that getting out of PlasticSCM woes is more cumbersome to me than getting out of similar git woes.
[WayBack] Jeroen Pluimers on Twitter: “While checking in to @plasticscm server and having a branch selected in the PlasticSCM GUI: ————————— Error ————————— No checkout branch found. ————————— OK —————————… https://t.co/k13K06mOFX”
Basically
--------------------------- Error --------------------------- No checkout branch found. --------------------------- OK ---------------------------
is the Plastic GUI way of saying “I think you have checked out branch A, but while checking that one in, I could not find it on the server, could it be that it got renamed or deleted?”.
The way to reliably get out of this situation (even if you are in a merge):
- Make a full backup of your directory tree (
robocopy /miris your friend here) - Keep a note of your check-in comment
- Undo your changes in the current branch
- Checkout a branch that never got renamed
- Quit the Plastic GUI
- Start the Plastic GUI
- Checkout the branch you want to apply your changes on
- Use Beyond Compare to compare the backup tree and the current checked out tree
- Sync anything changed using Beyond Compare
- Checkin the changes in PlasticSCM using the saved check-in comment
–jeroen
PS, the Twitter thread:
The Wiert Corner - irregular stream of stuff 