|
From: Bert F. <be...@is...> - 2002-05-13 19:06:03
|
On Mon, 13 May 2002, Tim Rowledge wrote:
> In message <E17...@le...>
> gor...@bl... wrote:
>
>
> > The update will tell you what files are modified "M" and that will be
> > committed.
> > You can also then see if other people have just committed stuff ("P"/"U"
> > etc) that you should take into account before committing.
> Ooh, ooh, does P mean 'pending'? I saw it a few times the other day
> (when I managed to commit everybody's open files - I cn't imagine what
> the logical argument in favour of that working was) and couldn't find an
> explanation in any of my cvs doc (I have assorted webpages snarfed
> locally that I use).
Then you just don't use the right doc. It's mentioned in the info files as
well as here, for example:
http://www.cvshome.org/docs/manual/cvs_16.html#SEC154
U The file was brought up to date with respect to the repository.
P Like `U', but the CVS server sends a patch instead of an entire file
M The file is modified in your working directory.X
C A conflict was detected while trying to merge your changes
-- Bert
|