From: Daniel Barkalow <barkalow@iabervon.org>
Date: Tue, 16 Sep 2008 17:32:08 GMT
Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4
Message-ID: <alpine.LNX.1.00.0809161326380.19665@iabervon.org>
In-Reply-To: <alpine.LNX.1.00.0809161211440.19665@iabervon.org>

On Tue, 16 Sep 2008, Daniel Barkalow wrote:

> p4 keeps track of which revision of each file you have synced to in your 
> client (so that it can fail to update it sometimes, as you mention above), 
> and will complain if the synced-to version isn't the latest when you try 
> to submit. That's how it avoids having people accidentally back out each 
> other's changes in ordinary operation. As long as we can be sure that the 
> client hasn't been synced to a later version than what the parent of the 
> commit we're submitting is an import of, which should be done with "p4 
> sync <changenumber>", rather than trying to spot check for having 
> accidentally acknowledged more p4 history than we've accounted for.

That is, "p4 sync <path>@<change>", of course.

	-Daniel
*This .sig left intentionally blank*