[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: rev 2557 - trunk/doc/handbook

From: Blair Zajac <blair_at_orcaware.com>
Date: 2002-07-17 18:52:47 CEST

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.

> +@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?


Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 17 18:53:14 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.