Blair Zajac <blair@orcaware.com> writes:
> Ben Collins-Sussman wrote:
> >
> > Blair Zajac <blair@orcaware.com> writes:
> >
> > > I haven't seen this one before:
> > >
> > > A + ./contrib/orca_services
> > > M + ./contrib/orca_services/Makefile.in
> > > M + ./contrib/orca_services/README
> > > D ./contrib/orcaservices
> > > D ./contrib/orcaservices/Makefile.in
> > > D ./contrib/orcaservices/README
> > >
> > > with the + in the third column. Snooping through the source code
> > > it looks like it means that the '+' means just that the files or
> > > directories were simply copied from somewhere else.
> >
> > The fourth column can sometimes show a '+'. This means the item is
> > part of a copied subtree. (Or in other words, the item is part of a
> > subtree scheduled to be 'added with history'.)
>
> I'm working on adding documentation in the handbook and the "subtree"
> part of this isn't clear to me. If I copy a file foo.c to bar.c, then
> I also get the +, so I guess it's more accurate to say that it's an
> (A)dd or (M)odify with a copy from somewhere else?
The 'A +' means the item is scheduled for addition-with-history. It
could be a file, or the root of a copied directory.
"_ +" means the item is part of a subtree scheduled for
addition-with-history. (i.e. some parent got copied, and it's just
coming along for the ride.)
"M +" means the item is part of a subtree scheduled for
addition-with-history, *and* it has local mods. (When you commit,
first some parent will be added-with-history (copied), which means
this file will automatically exist in the copy. Then the local mods
will be further uploaded into the copy.)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 25 21:49:16 2002