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

Sequence of SVN commits cannot be replayed

From: sebb <sebbaz_at_gmail.com>
Date: Sat, 22 Mar 2014 01:28:33 +0000

I think I have found a sequence of commits to SVN that cannot be
replayed in a workspace.

I was trying to change a file into a link, and made some mistakes in
the process.
These mistakes caused svnpubsub to leave the workspace incorrectly updated.

[Svnpubsub uses svn switch to change the workspace.]

I have since found that the same sequence of events cannot be replayed
using svn update either, though the errors occur in a different way.

To reproduce the problem, start as follows:

svn co http://dist.apache.org/repos/dist/release/commons/dbcp/@4582

Then apply the following revisions in order:

4583
4586
4588
4592
4593
4599

This can be done with svn switch (as done by svnpubsub) or using svn update -r

The resulting workspace should be the same as if one had invoked the following:

svn co http://dist.apache.org/repos/dist/release/commons/dbcp/@4599

But the process results in conflicts in the workspace.
I assume this is due to the use of svn:special and the link feature.

I would expect to be able to replay any sequence of updates so long as
they are done in the correct order. But in this case some of the
intermediate steps cause conflicts in the workspace.

This was tested (on minotaur) with

svn, version 1.7.9 (r1462340)

See also INFRA-7429
Received on 2014-03-22 02:29:06 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.