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

A few questions about the book

From: Larry Shatzer <fugazi_at_zyx.net>
Date: 2003-03-14 22:49:45 CET

While glancing over the book for a few things, I came across a few things that I
have questions about.

First, in Chapter 3 when it talks about trying to commit a file that is in
conflict, with the extra files still in, it gives the example:

$ svn commit --message "Add a few more things"
subversion/libsvn_client/commit.c:654: (apr_err=155015, src_err=0)
svn: A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
subversion/libsvn_client/commit_util.c:180: (apr_err=155015, src_err=0)
svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict.

Now, those lines that show the actual source file name, with line number, that
won't be there in a copy not compiled with --enable-maintainer-mode, right? If
so, should I submit a patch to take those out of here, and a few other places
the exist.

Also, I noticed some of the examples for 'svn diff' that are as follows:
--- COMMITTERS (revision 4404)
+++ COMMITTERS (working copy)

And then earlier in the book it would be shown as follows:
--- COMMITTERS
+++ COMMITTERS

I am guessing while the book was being written some of the output might have
changed. I am not sure I could provide a patch for this.

-- Larry

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 14 22:51:17 2003

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.