2009-03-01 01:13:39 Greg Stein napisał(a):
> You should let the RM decide what is "obvious" or not, what should be
> merged, and to do the actual merging.
http://subversion.tigris.org/hacking.html#obvious-fix
> On Sat, Feb 28, 2009 at 22:28, Arfrever Frehtes Taifersar Arahesis
> <Arfrever.FTA_at_gmail.com> wrote:
> > Author: arfrever
> > Date: Sat Feb 28 13:28:46 2009
> > New Revision: 36214
> >
> > Log:
> > On the '1.6.x' branch:
> > Merge obvious fix r36213 from trunk.
> >
> > * r36213
> > * subversion/svn/main.c
> > (svn_cl__cmd_table."status"): Update help message for 'svn status'.
> >
> > Modified:
> > branches/1.6.x/ (props changed)
> > branches/1.6.x/CHANGES (props changed)
> > branches/1.6.x/subversion/svn/main.c
> >
> > Merged:
> > /trunk:r36213
> >
> > Modified: branches/1.6.x/subversion/svn/main.c
> > URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/svn/main.c?pathrev=36214&r1=36213&r2=36214
> > ==============================================================================
> > --- branches/1.6.x/subversion/svn/main.c Sat Feb 28 13:14:42 2009 (r36213)
> > +++ branches/1.6.x/subversion/svn/main.c Sat Feb 28 13:28:46 2009 (r36214)
> > @@ -2,7 +2,7 @@
> > * main.c: Subversion command line client.
> > *
> > * ====================================================================
> > - * Copyright (c) 2000-2008 CollabNet. All rights reserved.
> > + * Copyright (c) 2000-2009 CollabNet. All rights reserved.
> > *
> > * This software is licensed as described in the file COPYING, which
> > * you should have received as part of this distribution. The terms
> > @@ -899,7 +899,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> > " svn status\n"
> > " M wc/bar.c\n"
> > " ! C wc/qaz.c\n"
> > - " > incoming edit, local missing\n"
> > + " > local missing, incoming edit upon update\n"
> > " D wc/qax.c\n"),
> > { 'u', 'v', 'N', opt_depth, 'q', opt_no_ignore, opt_incremental, opt_xml,
> > opt_ignore_externals, opt_changelist} },
--
Arfrever Frehtes Taifersar Arahesis
Received on 2009-03-01 01:24:28 CET