[p4] Perforce dropping important stuff
Steve Cogorno
cogorno at village.eng.sun.com
Tue Jul 10 13:08:20 PDT 2001
Kimberly McClintock said:
> Joe checks out a file, edits it & checks it back in via a numbered
> changelist. This becomes #4. Eric syncs, checks the same file out, edits it
> & checks it back in. This becomes #5. In half a dozen cases we have noticed,
> after the fact, that Eric's file #5 overwrote the changes in file #4; no
> other files in the changelist were affected. This is evident when you diff
> the revisions.
Are you sure that Eric didn't check the file out before the sync?
Example:
1. Joe: p4 edit
2. Joe: p4 submit
3. Eric: p4 edit
4. Eric: p4 sync
5. Eric: p4 submit
If the edit (#3) is before the sync (#4), Eric will have to use resolve to
get the changes that Joe added. If the sync is before the edit, no resolve
is needed.
If a resolve is needed, p4 sync will report something like:
<file> - must resolve #2 before submitting
BUT, you will still be able to submit without any further warning. If you
submit and don't resolve, the changes in the previous revisions will be
lost.
Steve Cogorno
Sun Microsystems
More information about the perforce-user
mailing list