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

Re: svn commit: r22790 - trunk/contrib/client-side

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: 2006-12-24 02:59:35 CET

Another type-o:

blair@tigris.org wrote:
> Author: blair
> Date: Sat Dec 23 17:45:49 2006
> New Revision: 22790
>
> Log:
> * contrib/client-side/svnmerge.py:
> Spelling fixes.
>
>
> Modified:
> trunk/contrib/client-side/svnmerge.py
>
> Modified: trunk/contrib/client-side/svnmerge.py
> URL: http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge.py?pathrev=22790&r1=22789&r2=22790
> ==============================================================================
> --- trunk/contrib/client-side/svnmerge.py (original)
> +++ trunk/contrib/client-side/svnmerge.py Sat Dec 23 17:45:49 2006
> @@ -1290,7 +1290,7 @@
> # Limit to revisions specified by -r (if any)
> revs = merged_revs & RevisionSet(opts["revision"])
>
> - # make sure theres some revision to rollback
> + # make sure there's some revision to rollback
> if not revs:
> report("Nothing to rollback in revision range r%s" % opts["revision"])
> return
> @@ -1700,10 +1700,10 @@
> OptionArg("-S", "--source", "--head",
> default=None,
> help="specify a merge source for this branch. It can be either "
> - "a path, a full URL, or an unambigous substring of one the "
> - "paths for which merge tracking was already initialized. "
> - "Needed only to disambiguate in case of multiple merge "
> - "sources"),
> + "a path, a full URL, or an unambiguous substring of one "
> + "the paths for which merge tracking was already "
Missing 'of' ^

> + "initialized. Needed only to disambiguate in case of "
> + "multiple merge sources"),
> ]
>
> command_table = {

Received on Sun Dec 24 02:59:53 2006

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