#56 ch02: Wrong file name in tree conflict example

[Anonymous]

Originally created by: alex.jar...@gmail.com
Originally owned by: cmpilato

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'

[Anonymous]

Originally posted by: cmpilato

(No comment was entered for this change.)

Owner: cmpilato

[Anonymous]

Originally posted by: cmpilato

(No comment was entered for this change.)

Summary: ch02: Wrong file name in tree conflict example
Labels: Milestone-en-1.6

[Anonymous]

Originally posted by: cmpilato

Really?  But if I'm following the example correctly, it's actually code/bar.c that's in conflict, not code/baz.c.

stsp, am I missing something here?

Cc: s...@elego.de

[Anonymous]

Originally posted by: cmpilato

After further review, I believe the text is accurate.

Status: Invalid