Skip to content

Commit

Permalink
fix(subversion): Make the peg revision newer than the operative revision
Browse files Browse the repository at this point in the history
Ensure that always the first algorithm mentioned at [1] is applied. This
avoids errors e.g. when updating to a resolved revision of a tag path.

Fixes #6160.

[1]: https://svnbook.red-bean.com/en/1.7/svn.advanced.pegrevs.html

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
  • Loading branch information
sschuberth committed Apr 25, 2024
1 parent e27f755 commit 03e5fe7
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,12 @@ class Subversion : VersionControlSystem() {
"Switching $type '${workingTree.workingDir}' to $svnUrl at revision $printableRevision."
}

// For "peg revision" vs. "revision" see https://svnbook.red-bean.com/en/1.7/svn.advanced.pegrevs.html.
val workingTreeRevision = clientManager.updateClient.doSwitch(
workingTree.workingDir,
svnUrl,
svnRevision,
svnRevision,
/* pegRevision = */ SVNRevision.HEAD,
/* revision = */ svnRevision,
if (path.isEmpty()) SVNDepth.INFINITY else SVNDepth.EMPTY,
/* allowUnversionedObstructions = */ false,
/* depthIsSticky = */ true
Expand Down

0 comments on commit 03e5fe7

Please sign in to comment.