Issue 56 in svnbook: Wrong file name in tree conflict example

codesite-noreply at google.com codesite-noreply at google.com
Sat Aug 8 08:51:36 CDT 2009


Status: New
Owner: ----
Labels: Type-Defect Priority-Medium

New issue 56 by wjarosie... at yahoo.com: Wrong file name in tree conflict  
example
http://code.google.com/p/svnbook/issues/detail?id=56

On
http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html
in chapter 2 paragraph "An example Tree Conflict" 9th example right after
"In case you agree, you can delete bar.c and mark the tree conflict as
resolved:" reads:
$ svn remove --force code/bar.c
D         code/bar.c
$ svn resolve --accept=working code/bar.c
Resolved conflicted state of 'code/bar.c'

I believe in this example this should read
$ svn remove --force code/bar.c
D         code/bar.c
$ svn resolve --accept=working code/baz.c
Resolved conflicted state of 'code/baz.c'

--
You received this message because you are listed in the owner
or CC fields of this issue, or because you starred this issue.
You may adjust your issue notification preferences at:
http://code.google.com/hosting/settings




More information about the svnbook-dev mailing list