[p4] Issue with edit on integrate

[Ivey, William]

When you integrate a file and want to edit it, you need to
reopen it for editing. Otherwise Perforce assumes the copy
it has on the server is the same as your copy and doesn't
bother to fetch your changes.

In some cases, during resolve, I believe the file is
implicitly opened for editing so it works in those cases.

-Wm


> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com]On Behalf Of Albrecht, Matt
> Sent: Thursday, January 04, 2007 1:10 PM
> To: perforce-user at perforce.com
> Subject: [p4] Issue with edit on integrate
> 
> 
> One of my users reported a problem when they did an edit on a 
> file that
> was also marked for integrate.  I've walked through the steps 
> he made to
> get a clear picture of what happened, and I think I have a good
> understanding of the user's mistake, and what Perforce was 
> doing to make
> it look like Perforce screwed up.
> 
> 1. integrated from "//depot/branchA/" to "//depot/branchB/", which
> worked fine.
> 2. created file "//depot/branchB/foo.txt" and submitted it for add.
> 3. performed several edits on this file in branchB, bringing it up to
> revision #5.
> 4. integrated "//depot/branchB/..." to "//depot/branchA/..." 
> into a new
> changelist.  This marked "//depot/branchA/foo.txt" as integrate with
> add.
> 5. modified "//depot/branchA/foo.txt" on his hard drive 
> (adding several
> lines)
> 6. submitted the changelist.
> 
> At this point, his hard drive contained a different version of
> "//depot/branchA/foo.txt" than what Perforce reports as the depot
> version of "//depot/branchA/foo.txt".
> 
> He had done similar operations where "//depot/branchA/foo.txt" existed
> in step 1, and Perforce did the right thing.
> 
> My only guess is that Perforce uses a different record in the db files
> to mark a file as "integrate for add" and "integrate for edit," and so
> the server only put an entry linking to "//depot/branchB/foo.txt#5"
> without also marking the edits that were made before integrate.
> 
> So, besides slapping my users around with a limp salami, does anyone
> know of a way to force users to "do the right thing," or is this bring
> up a potential issue in how Perforce performs integrations?
> 
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
> 
>