Blair Zajac <blair@orcaware.com> writes:
> sussman@tigris.org wrote:
> >
> > Author: sussman
> > Date: Tue, 16 Jul 2002 23:39:43 -0500
> > New Revision: 2557
> >
> > Modified:
> > trunk/doc/handbook/appendices.texi
> > trunk/doc/handbook/client.texi
> > trunk/doc/handbook/getting_started.texi
> > Log:
> >
>
> Great work on this!
>
> > +@subsection Moving changes with @command{svn merge}
> > +
> > +Suppose a team of programmers working on the @file{mooIRC-beta} branch
> > +have fixed a critical bug, and the team working on the original
> > +@file{mooIRC} branch would like to apply that change as well.
> > +
> > +The @command{svn merge} command is the answer. You can think of
> > +@command{svn merge} as a special kind of @command{svn diff}; only
> > +instead of displaying unified diffs to the screen, it @emph{applies}
> > +the differences to your working copy as if they were local changes.
>
> It would be useful here to mention if subversion keeps track of the
> merge's that occurred to help later merges, or if this is a version
> 2.0 feature, or is even planned. I think people with experience from
> other SCMs would want to know.
Great idea.
> > +@subsubsection @samp{svn:ignore}
> > +
> > +If you attach this property to a directory, it causes certain file
> > +patterns within the directory to be ignored by @command{svn status}.
> > +For example, suppose I don't want to see object files or backup files
> > +in my status listing:
> >
> > -@subheading Getting a Property's Value
> > +@example
> > +$ svn status
> > +M ./foo.c
> > +? ./foo.o
> > +? ./foo.c~
> > +@end example
>
> What are the allowable regular expressions?
I guess it depends on how apr_fnmatch() works. Here's our relevant
code block from libsvn_wc/status.c:
/* See if any of the ignore patterns we have matches our
keystring. */
for (i = 0; i < patterns->nelts; i++)
{
const char *pat = (((const char **) (patterns)->elts))[i];
/* Try to match current_entry_name to pat. */
if (APR_SUCCESS == apr_fnmatch (pat, keystring, FNM_PERIOD))
{
ignore_me = 1;
break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 17 19:01:17 2002