Jump to content

Search the Community

Showing results for tags 'shelve'.



More search options

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

Found 5 results

  1. Ashot Vantsyan

    "View Shelve" analog in cli

    Hi all, I would like to clarify if there is a way to view a shelve more informatively than can report the following command: cm find shelve on repository '"<repo>"' In other words I would like to find an analog of "View Shelve" feature in the GUI. Thanks in advance, Ashot
  2. dgee2

    Shelve Error/Bug

    Hi, I'm having issues with shelves on one particular repository. When I create a shelve, it is created with the same name (but different Guid) as the most recent shelve. Running a diff of either shelve seems to return the changes from both shelves. While both shelves are in place, no merges or checkins can be performed by any user. (Checkouts seem to be unaffected) Deleting the most recent of the two shelves deletes the first of the two. Deleting both shelves (including the pre-existing one) seems to bring the repository back into normal operation. Shelves can then be checked in with the correct (auto-incrementing) name. This seems to last for at least the same day (possibly longer although we suspect that restarting PlasticSCM as part of our backup routine may be one of a many possible causes) This issue has caused us to lose some code when this last happened. Is this a known bug that is yet to be fixed or is there a fix that we have missed that we should be putting in place? (We haven't been able to find any reference to a bug like this on any of the forums or release notes) We are currently running the 5.4.16.671 - Edmonton release. Thanks Daniel
  3. Hi, Shelves control seems not to be exposed yet in the GUI of the GTK client and I was looking for a means of managing them using the CLI. I didn't find anything in the docs and the CLI help to list existing shelves. I found out that the following does the job : cm find shelve --format="{shelveid} {comment}" But I discovered the param shelveid by chance. It doesn't seem to be mentioned in the docs. Or did I miss it ? All the best Fred
  4. I'm using VS2012 and the Plastic VS plugin. Everything is working fine, but when I sent some pending changes to be shelved through the extra commit options I could not get them back again! I went into the Plastic GUI and unshelved the changes into my workspace, but I can't find a way to do it through VS. This tab seems to be missing from the plugin toolbar! Is there a way to enable/include it that I'm just missing? Thanks, Ryan
  5. While attempting to check-in pending changes, I got this error message: "Revision 15306 not found in repository 65". I cancelled the check-in, shut down and restarted plastic, then tried checking in again, same result. Prior to the check-in, I had changed 2 files that I wanted to check in, but also had created a few dozen other files that I did not want to check-in. When I checked-in, I selected ALL the files (the changes and the additions), so after the check-in, I did a subtractive merge of the last change set. Then I created a branch from the change set before the bad check-in, merged the bad change set to the new branch BUT DID NOT check it in. I then shelved the pending changes (and cancelled the changes). I did this so I could capture the changes I wanted to keep. Finally, I cancelled the pending changes on the new branch. Then I switched back to the tip of the original branch, and deleted the subtractive merge change set and the bad merge change set. Next, I applied the shelved change set to my pending work space, deleted the new pending files (and kept the 2 good changes). Finally I tried to check-in the two good changes. And that's when I got the error. On more thing I noticed: while viewing pending changes, if I select Show diffs, I see an old copy of the file (cs:483) on the left, but nothing on the right (cs:485). Any ideas what I did wrong? Any idea how I should recover? Regards, Bill.
×