On Tue, Sep 15, 2009 at 05:06:43PM +0200, Stein Somers wrote:
> Stefan Sperling wrote:
> > At which point do you get the failure?
>
> The last step, the update.
>
> > this script (which I hope is equivalent to what you were doing):
>
> It's different in that:
> - it forgets to cause a tree conflict, so not much point in resolving
> - it has the revision numbers off by one, because my revision 1 was the
> creation of the top directory.
>
> With the following variation of your script I have the same assertion abort
> on CentOS 5:
Thanks!
Which version are you reproducing the marshal.c assertion with?
Both 1.6.x and trunk give the following output for me:
+ rm -rf bug2
+ mkdir -p bug2
+ mkdir -p bug2/trunk
+ echo alpha
+ > bug2/trunk/alpha
+ echo beta
+ > bug2/trunk/beta
+ svnadmin create /tmp/bug2/repos
+ svn import bug2/trunk file:////tmp/bug2/repos/trunk -m importing project tree
Adding bug2/trunk/alpha
Adding bug2/trunk/beta
Committed revision 1.
+ rm -rf bug2/trunk
+ svn checkout file:////tmp/bug2/repos/trunk bug2/trunk
A bug2/trunk/alpha
A bug2/trunk/beta
Checked out revision 1.
+ svn rm bug2/trunk/alpha
D bug2/trunk/alpha
+ svn ci -mm bug2/trunk
Deleting bug2/trunk/alpha
Committed revision 2.
+ svnserve --pid-file bug2/svnserve.pid --listen-host localhost --listen-port 36900 -d -r bug2/repos
+ cat bug2/svnserve.pid
+ trap kill 24985 0
+ svn co svn://localhost:36900/trunk_at_1 bug2/trunk2
A bug2/trunk2/alpha
A bug2/trunk2/beta
Checked out revision 1.
+ ls -l bug2/trunk2/alpha
-rw-r--r-- 1 stsp wheel 6 Sep 15 17:03 bug2/trunk2/alpha
+ echo gamma
+ > bug2/trunk2/alpha
+ ls -l bug2/trunk2/alpha
-rw-r--r-- 1 stsp wheel 6 Sep 15 17:03 bug2/trunk2/alpha
+ svn stat bug2/trunk2
M bug2/trunk2/alpha
+ svn up bug2/trunk2
C bug2/trunk2/alpha
At revision 2.
Summary of conflicts:
Tree conflicts: 1
+ svn resolved bug2/trunk2/alpha
Resolved conflicted state of 'bug2/trunk2/alpha'
+ svn up -r1 --force bug2/trunk2
C bug2/trunk2/alpha
At revision 1.
Summary of conflicts:
Tree conflicts: 1
+ svn revert bug2/trunk2/alpha
Reverted 'bug2/trunk2/alpha'
+ svn up bug2/trunk2
subversion/svn/update-cmd.c:96: (apr_err=210000)
subversion/libsvn_client/update.c:371: (apr_err=210000)
subversion/libsvn_client/update.c:294: (apr_err=210000)
subversion/libsvn_wc/deprecated.c:149: (apr_err=210000)
subversion/libsvn_ra_svn/client.c:296: (apr_err=210000)
subversion/svnserve/serve.c:851: (apr_err=210000)
svn: Special code for wrapping server errors to report to client
subversion/libsvn_wc/update_editor.c:2001: (apr_err=150000)
subversion/libsvn_wc/entries.c:1325: (apr_err=150000)
svn: 'bug2/trunk2/alpha' is not under version control
+ kill 24985
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395143
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-15 18:06:56 CEST