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

Re: manual inconsistency regarding resolved arguments

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2003-08-15 04:23:09 CEST

Vazquez, Jose wrote:
> I was not sure whether to send this here or to the dev mailing list. Should

Either is OK.

> Under "Guided Tour/Basic Workcycle/Resolving Conflicts (Merging Others'
> Changes)/Copying a File Onto Your Working File" the example included is
...
> $ svn resolved
...
> notice the second to last command "$ svn resolved". Later in the chapter you
> state :
> "Now you're ready to check in your changes. Note that svn resolved, unlike
> most of the other commands we've dealt with in this chapter, requires an
> argument.
...
> Notice that the second sentence states that resolved requires an argument
> but your example does not show one. This is confusing. I suggest you clarify
> it for future users

Thank you for reporting this error. The correct command in this case is:

$ svn resolved sandwich.txt

I will include this correction when I next change the book.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 15 04:24:31 2003

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