[p4] Issue with edit on integrate
Ken Williams
ken.williams at thomson.com
Thu Jan 4 13:12:57 PST 2007
> From: "Albrecht, Matt" <matt.albrecht at zilliant.com>
> Date: Thu, 4 Jan 2007 13:51:25 -0600
> To: Stephen Vance <steve at vance.com>
> Cc: <perforce-user at perforce.com>
> Conversation: [p4] Issue with edit on integrate
> Subject: Re: [p4] Issue with edit on integrate
>
> Yes, step (1) was an integrate + submit. (2) was a submit in a separate
> changelist from (1). For (5), the user essentially did this:
>
> $ p4 change
> (creates empty changelist # 1234)
> $ p4 integrate -c 1234 //depot/branchB/... //depot/branchA/...
> $ vi /home/user/workspace/branchB/foo.txt
> (make some edits and save, and most probably ignoring the read-only
> flag)
> $ p4 submit -c 1234
In that case, you might want to show the user this technote:
Checking Out a File from "vi"
How do you check out a file from Perforce when already in vi?
http://www.perforce.com/perforce/technotes/note011.html
-Ken
More information about the perforce-user
mailing list