Hi dev, what output do you expect for these two almost similar cases?
[[[ # make a simple dir with file mkdir srcdir echo x > srcdir/x svn add srcdir svn ci -m1 # make a locally added dir mkdir branchdir echo yy > branchdir/x svn add branchdir # create a branch behind the locally added dir svn cp -m2 ^/srcdir ^/branchdir # case (2) adds only this line: #rm -rf branchdir svn up --accept=postpone svn st ]]] The output you expect -- a tree conflict, right? -- you're not getting it. Case (1) gives a *text* conflict: [[[ + svn up --accept=postpone Updating '.': C branchdir/x E branchdir Updated to revision 2. Summary of conflicts: Text conflicts: 1 ]]] Case (2) goes completely nuts: [[[ + svn up --accept=postpone Updating '.': subversion/svn/update-cmd.c:172, subversion/libsvn_client/update.c:706, subversion/libsvn_client/update.c:614, subversion/libsvn_client/update.c:466, subversion/libsvn_wc/adm_crawler.c:845, subversion/libsvn_repos/reporter.c:1542, subversion/libsvn_repos/reporter.c:1453, subversion/libsvn_repos/reporter.c:1445, subversion/libsvn_repos/reporter.c:1383, subversion/libsvn_repos/reporter.c:1321, subversion/libsvn_repos/reporter.c:1040, subversion/libsvn_repos/reporter.c:1321, subversion/libsvn_repos/reporter.c:1074, subversion/libsvn_wc/update_editor.c:4374, subversion/libsvn_wc/update_editor.c:4071, subversion/libsvn_wc/update_editor.c:3911, subversion/libsvn_wc/merge.c:1176, subversion/libsvn_wc/merge.c:869, subversion/libsvn_wc/merge.c:414, subversion/libsvn_diff/diff_file.c:1332, subversion/libsvn_diff/diff3.c:277, subversion/libsvn_diff/diff_file.c:788, subversion/libsvn_subr/io.c:3271: (apr_err=ENOENT) svn: E000002: Can't open file '/tmp/trunk.wvg/wc/branchdir/x': No such file or directory ]]] I'll add two issues if I get plussed. ~Neels
signature.asc
Description: PGP signature
