Perforce and PhpStorm/WebStorm: shelved files from default changelist disappear -
i learning how use perforce version control understanding of processes weak. phpstorm 2017 ide.
i'd as possible use ide version control operations, linked ide perforce client (instructions). created files , in p4v, appeared in default pending changelist. once finished, within phpstorm selected "menu bar >> vcs >> shelve changes..." expecting see files moved shelf within changelist in perforce.
instead, files have disappeared best can tell. gone os folder structure, , don't show in perforce either in default changelist or shelf.
i need figuring out:
- what happened files?
- how them back?
- can phpstorm/webstorm used work perforce shelving/unshelving? if so, how properly?
there couple of concepts needed understand first:
phpstorm offers own shelve/unshelve functionality, independent of version control system
my files not found because "main menu >> vcs >> shelve changes..." put them in ide's shelf, not perforce's. ide's shelf inside <project-root>/.idea/shelf
what gets shelved set of changes since last commit, not file itself
this led fundamental misunderstanding on part. thought files missing because couldn't see them in os folders, missing changes made files. it's because files new -- , changes comprised of whole files -- appeared though files missing.
what happened when shelved: files rolled committed state (in case nonexistent), , changes saved on shelf
all shelving/unshelving accessible version control tool window
pressing alt + 9
brings tool window. when items have been shelved, there shelf
tab. there, able see changes, , unshelf them. got files back!
perforce shelf accessible separate menu item
open version control tool window , select "local changes" tab. 1 context option visible upon right-clicking changed file within tab "shelve changes...". equivalent did , put file changes in ide's shelf. when perforce integrated ide project, option wanted appears as: "shelve in perforce..."
this option place files changes in perforce shelf (on perforce server) , rollback working directory last commit state. changes not visible within "shelf" tab of version control tool (as tab shows ide shelf). browse perforce shelf, go "local changes" tab of tool, right click appropriate perforce changelist -- looks <list-name> - perforce #<list-number>; x shelved changes
-- , select "browse perforce shelf..."
Comments
Post a Comment