Jump to content

Jammed changeset, can't undo Pending Changes


J Malcolm
 Share

Recommended Posts

My checkins today suddenly stopped registering on the Plastic server, which is something I encounter often and can usually fix by logging in to the Plastic Server app and clicking “Undo” on the jammed changeset. 

Today I have a jammed changeset, displayed with a dashed circle in the Branch Explorer indicating there are pending changes. When I click “View Pending Changes”, there are 61 Changed Items, all of which are labeled “Files are identical”. It won’t let me “Undo” or “Checkin” this changeset. Instead it gives me an error:

Quote

chmod: Operation not permitted. Item: /var/www/[private path]/[private filename].css

I moved the jammed changeset to a new branch to get it out of the way, but when I try to change the workspace back to the main branch, I get this error:

Quote

Cannot perform the switch to branch/label/changeset/shelve since there are pending changes. Please review the pending changes and retry the operation again.

I just want to delete/undo the pending changes. How can I do that?

(I just sent this request to support via email, apologies for the double submission!)

EDIT: I've also restarted the Plastic SCM service on the server, but that didn't fix the problem.
 

Link to comment
Share on other sites

Nevermind, I solved it. A rather frustrating.. bug?

I brute force tried a bunch of things for a couple hours, and this ended up solving my problem:

1. Login to server environment
2. navigate to my live workspace directory
3. delete all files
4. open plastic server app
5. "Undo" pending changes ("Undo" works for deleted files, but not for changed/checked-out files???)
6. "Update Workspace" on Plastic server
7. (This removed the jammed changeset, but the workspace was still stuck on an old changeset and would not change, citing "an unexpected error occurred")
8. Change a file from desktop app, checkin & merge with main branch
9. The merge trigger on the server failed, so, merge again from Plastic server
10. Now it's working

Dear Plastic Admin, why do these jammed changesets keep happening? Anything I can do to prevent this?
 

Link to comment
Share on other sites

Hmmm... I suspect you may have hidden changes configured.

 

The next time you are hit with this, can you please run cm status --hiddenchanged, and report back if there is anything there? Also, you can reveal hidden changes in the Pending Changes view via the below setting.
?name=image.png 

Hope this helps!
 

Link to comment
Share on other sites

  • 3 weeks later...

Hello, I've been hit with this again, a few times.

I ran cm status --hiddenchanged, it returned a list of the 61 "changed" files, which are also shown in the server GUI under Pending Changes. Second, I found the Pending Changes Options you mentioned and checked the box to Show Hidden Files.

I can't Undo or Checkin the 61 pending changes. They're just... jammed. See in my screenshot below, it shows 61 changed items, listed as Status "Changed", but the yellow "Files are identical" ribbon is shown on the diff pane at the bottom. When I click the "Undo" button, I get an error that says: 

chmod: Operation not permitted. Item: [path]/file.css

How do I clear these jammed items?




image.thumb.png.2cf9a042ed92420d7472478cd20a129b.png


 

Link to comment
Share on other sites

It seems that you have an application changing the permissions and/or the timestamp of the file which is causing them to show as changed with the content being identical.

  • Are you able to run Plastic SCM with elevated privileges? This should resolve the inability to change the permissions on the files.
  • What application are you using to modify these files? Is it possible that this 3rd party software is modifying the OS level permissions on them?

Hope this helps!

Link to comment
Share on other sites

10 hours ago, ollieblanks said:
  • Are you able to run Plastic SCM with elevated privileges? This should resolve the inability to change the permissions on the files.

Not sure what you mean by that, but my user is an "admin" user, if that answers the question?

10 hours ago, ollieblanks said:
  • What application are you using to modify these files? Is it possible that this 3rd party software is modifying the OS level permissions on them?

I'm using Notepad++ to modify the files on my local machine. I'm also using bots to trigger checkins and merges on the server, if that's relevant? I have no idea if Notepad++ is modifying OS level permissions, but I doubt it? How can I check on this?

Something to note: the temporary changeset (aka jammed changeset) is only on the Plastic server app. I don't see any problem on my Plastic Desktop app. All merges and updates on desktop are a-ok. Is that a clue?

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...