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

Re: [PATCH] Re: Issue #3354: copy operation during update fails

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 19 Jan 2009 12:07:20 -0500

On Mon, Jan 19, 2009 at 11:17 AM, Paul Burba <ptburba_at_gmail.com> wrote:

> But if I put a break in update_tests.py 52 just prior to the last
> update and then run that last update myself from the command line,
> then there is no error, and everything looks correct:
.
<snip>
.
> trunk_at_35322>svn up update_tests-52.other\A\B\E
> C update_tests-52.other\A\B\E\alpha
> Conflict discovered in 'update_tests-52.other/A/B/E/alpha.moved'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options: p
> C update_tests-52.other\A\B\E\alpha.moved
> Updated to revision 3.
> Summary of conflicts:
> Text conflicts: 1
> Tree conflicts: 1
>
> trunk_at_35322>svn st update_tests-52.other
> ? update_tests-52.other\A\B\E\alpha.moved.copied
> ? update_tests-52.other\A\B\E\alpha.moved.r3
> ? update_tests-52.other\A\B\E\alpha.moved.mine
> A + C update_tests-52.other\A\B\E\alpha
> > local edit, incoming delete upon update
> C update_tests-52.other\A\B\E\alpha.moved

Getting somewhere...If I don't interactively postpone conflict
resolution when manually running the final update then I *do* see the
file not found error:

trunk_at_35322>svn up update_tests-52.other\A\B\E --accept postpone
                                                    ^^^^^
   C update_tests-52.other\A\B\E\alpha
C update_tests-52.other\A\B\E\alpha.moved
svn: In directory 'update_tests-52.other\A\B\E'
svn: Can't open file 'update_tests-52.other\A\B\E\alpha.moved': The
system cannot find the file specified.

trunk_at_35322>svn st update_tests-52.other
! L update_tests-52.other\A\B\E
? update_tests-52.other\A\B\E\alpha.moved.copied
? update_tests-52.other\A\B\E\alpha.moved.r3
? update_tests-52.other\A\B\E\alpha.moved.mine
A + C update_tests-52.other\A\B\E\alpha
> local edit, incoming delete upon update

This makes sense because the test suite uses a config with:

  [miscellany]
  interactive-conflicts = false

And as expected, if I set my own config that way, then the error occurs:

trunk_at_35322>type "C:\Documents and Settings\pburba\Application
Data\Subversion\config"
<snip>
### Section for configuring miscelleneous Subversion options.
[miscellany]
### Set global-ignores to a set of whitespace-delimited globs
### which Subversion will ignore in its 'status' output, and
### while importing or adding files and directories.
# global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store
### Set log-encoding to the default encoding for log messages
# log-encoding = latin1
### Set use-commit-times to make checkout/update/switch/revert
### put last-committed timestamps on every file touched.
# use-commit-times = yes
### Set no-unlock to prevent 'svn commit' from automatically
### releasing locks on files.
# no-unlock = yes
### Set enable-auto-props to 'yes' to enable automatic properties
### for 'svn add' and 'svn import', it defaults to 'no'.
### Automatic properties are defined in the section 'auto-props'.
# enable-auto-props = yes
interactive-conflicts = false

trunk_at_35322>svn up update_tests-52.other\A\B\E
   C update_tests-52.other\A\B\E\alpha
C update_tests-52.other\A\B\E\alpha.moved
svn: In directory 'update_tests-52.other\A\B\E'
svn: Can't open file 'update_tests-52.other\A\B\E\alpha.moved': The
system cannot find the file specified.

So yay, I can reproduce it.

Note, I tweaked the test in r35325 so it is clearer what the problem is.

Paul
Received on 2009-01-19 18:17:49 CET

This is an archived mail posted to the Subversion Dev mailing list.