I was not sure whether to send this here or to the dev mailing list. Should
there be a documentation mailing list or maybe an errata email address?
anyways...
Under "Guided Tour/Basic Workcycle/Resolving Conflicts (Merging Others'
Changes)/Copying a File Onto Your Working File" the example included is
$ svn update
C sandwich.txt Updated to revision 2.
$ ls sandwich.*
sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1
$ cp sandwich.txt.r2 sandwich.txt
$ svn resolved
$ svn commit -m "Go ahead and use Sally's sandwich, discarding my edits."
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. In any case, you want to be careful and only run svn resolved when
you're certain that you've fixed the conflict in your file-once the
temporary files are removed, Subversion will let you commit the file even if
it still contains conflict markers."
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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 14 20:52:38 2003