By the looks of the edited description you added and deleted files directly on the filesystem and not through perforce. Therefore Perforce doesn't know anything about those changes so there is nothing to revert. Typically when you want to add a file you use 'p4 add" (or the equivalent p4v operation), and when you delete, you should use 'p4 delete' (or again, the equivalent p4v operation) Really, the best option to get back to a pristine state is to nuke the local copy of the code in c:\perforce (in windows explorer), go to p4v, right click the area you want to sync, and choose "Get Revision..." and in the subsequent dialog, make sure that the "force operation" checkbox is checked.
This will tell Perforce that you want a new copy of everything regardless of whether you had it synced or not You can also run "reconcile offline work" in p4v. Right click the depot area and choose that option. It will scan through the local folder structure and give you a report of what files have been added that don't exist in perforce, what files were deleted, and what files were modified.
From that dialog, you can right click on local files that don't exist in perforce and delete them, or you can 'p4 add' them. You can also sync deleted files HTH.
By the looks of the edited description you added and deleted files directly on the filesystem and not through perforce. Therefore Perforce doesn't know anything about those changes so there is nothing to revert. Typically when you want to add a file you use 'p4 add" (or the equivalent p4v operation), and when you delete, you should use 'p4 delete' (or again, the equivalent p4v operation).
Really, the best option to get back to a pristine state is to nuke the local copy of the code in c:\perforce (in windows explorer), go to p4v, right click the area you want to sync, and choose "Get Revision..." and in the subsequent dialog, make sure that the "force operation" checkbox is checked. This will tell Perforce that you want a new copy of everything regardless of whether you had it synced or not. You can also run "reconcile offline work" in p4v.
Right click the depot area and choose that option. It will scan through the local folder structure and give you a report of what files have been added that don't exist in perforce, what files were deleted, and what files were modified. From that dialog, you can right click on local files that don't exist in perforce and delete them, or you can 'p4 add' them.
You can also sync deleted files. HTH.
This is what I wanted to know. SVN, Hg, etc. All allow you to use revert to delete local files not in the repository and re-add deleted files that are still in the repository. – ashes999 Sep 20 at 12:45 Perforce will only keep track of files that it "knows" about.
So when you delete local files that are not stored in the repository, Perforce doesn't know anything about them. Just keep in mind that anytime you act on files in your workspace, if you want perforce to know about it, you have to use Perforce commands (or then use something like reconcile offline work to get back in sync with what Perforce thinks that you have locally on your workstation) – Mark Sep 20 at 13:37 that's understandable. What I don't understand (maybe because of my SVN/Hg background) is that Perforce seems to "ignore" the file-system and not allow you a one-click revert to exactly what's on the server.
That seems like a usability failure to me. – ashes999 Sep 20 at 13:56 You can call it a usability failure, but many will see that as a plus - it's simply a different paradigm. Perforce is super fast for nearly all of its operations because it keeps track of what is on your local workspace and doesn't have to do any kind of fixups to make your workspace match what's on the server unless you tell it to.
This change in thinking (and this speed) really shines when you have workspaces of 500K+ files. Working on data sets that large is still blazingly fast in Perforce. – Mark Sep 20 at 14:19.
Reverts of adds will leave the files in your file system, but the deleted files should be back as well. It sounds like you did everything correctly. Are any files listed in your default pending changelist?
This should probably be a comemnt. No, there are no files on the default pending changelist. – ashes999 Sep 19 at 18:00.
Then does a forced overwrite of the file (via vi's :w! Done automatically, but resolved shows you what happened. C:\bruno_ws\main\jam>p4 integ jam.
C#1 - branch/sync from //depot/main/jam/jam.
I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.