14 messages in com.perforce.perforce-user[p4] Edit/Submit without changes crea...
FromSent OnAttachments
Piaw Na16 Dec 1999 09:15 
Mike Morris16 Dec 1999 09:27 
Scott Blachowicz16 Dec 1999 10:43 
Michael Cook16 Dec 1999 13:55 
Michael Graff20 Dec 1999 10:39 
Piaw Na20 Dec 1999 10:53 
Nick Triantos20 Dec 1999 11:03 
Ed Mack20 Dec 1999 11:10 
Russell Jackson20 Dec 1999 12:16 
Paul Goffin21 Dec 1999 04:41 
jorg...@db.com21 Dec 1999 05:47 
Yariv Sheizaf21 Dec 1999 22:59 
Scott Blachowicz22 Dec 1999 20:53 
Nick Triantos23 Dec 1999 15:36 
Subject:[p4] Edit/Submit without changes creates a new version
From:Michael Cook (co@sightpath.com)
Date:12/16/1999 01:55:52 PM
List:com.perforce.perforce-user

"Mike Morris" <mikem at perceptron.com> writes:

I can imagine, though I don't use this practice, that having examined a file for certain conditions, then finding nothing needing a change could be reason enough to allow the system to increment the version number and keep the file in the change list to indicate that the check had been done on that file.

How about when integrating.

Say I run `p4 integrate' and it decides a file needs to be integrated. I run `p4 resolve' and it just happens to end up that the resulting file is unchanged. Perhaps the two versions are already identical because someone manually made the same change in each version.

Now, if I do `p4 revert', then the next time I run `p4 integrate', it tells me the file needs to be integrated.

If instead of doing `p4 revert', I do `p4 submit', then the integration gets recorded, and a new (identical) version gets created. Now, I think if I were to do a `p4 integrate' in the "other direction" (e.g., the previous merge was from a branch to the mainline, and now I do a merge from the mainline to the branch), p4 would think a merge needs to be done. The two versions are identical, but there doesn't seem to be a way to tell p4 that, right?

M.