Re: [PATCH] Optional shrinking of RCS keywords in git-p4
- From
Daniel Barkalow <barkalow@iabervon.org>
- Date
- Sep 16, 2008, 17:26 UTC
- Message-ID
- <alpine.LNX.1.00.0809161316030.19665@iabervon.org>
- In-Reply-To
- <98627.82548.qm@web95002.mail.in2.yahoo.com>
On Tue, 16 Sep 2008, dhruva wrote:
Show 17 quoted lines
> Hi, > > > > ----- Original Message ---- > > From: David Brown <git@davidb.org> > > Part of the problem is that p4 isn't very good at knowing whether > > files have changed or not. 'p4 sync' will update the file _if_ if > > thinks your version is out of date, but it does nothing if someone has > > locally modified the file, hence the need for the 'p4 sync -f'. > > If you have modified a file without doing a 'p4 edit' and if there is a > new version of the edited file on p4 (from what you have got from a > previous 'p4 sync'), 'p4 sync' will overwrite your changes (if the file > does not have write perm set or if you have enabled clobbering of > writable files). Whereas 'p4 sync -f' will always overwrite all unopened > files if a newer version is available.
p4 sync -f will overwrite all unopened files. It will clobber writable files, and it will clobber files where there isn't a newer file (it's one of the ways of dealing with accidentally erasing your workspace).
-Daniel *This .sig left intentionally blank*