Revert before update - why?

Answered

Permanently deleted user

Created January 30, 2017 08:16

TeamCity svn has a Revert before update option.

However, as documented, even when the option is unchecked, TeamCity still does revert after update.

Revert "before" would mitigate possible merge conflicts before update, but revert "after" will solve those conflicts after update. So as far as I see, the end result should be the same either way.

Is there any particular reason / use case to prefer revert "before" vs. "after" update?

4 comments

Alina Mishina

Created February 01, 2017 13:11

Hello Joonas,

If option is disabled, then only modifications detected during the update process are reverted. However there are also can be modifications during the build process.

If option is enabled, then all modifications performed during build process will also be reverted. It can be used instead of "Clean checkout" option if you need to revert only versioned files.

Permanently deleted user

Created February 02, 2017 06:58

Thanks for clarification,

I think the documentation is a bit misleading, or there's something wrong. Let's look at logs.

Revert before update on - then it seems to revert after updating sources - or maybe the log order doesn't reflect the actual order in which things happen?

[06:00:17]Updating sources: auto checkout (on agent) (14s)
[06:00:17][Updating sources] Will use agent side checkout
[06:00:17][Updating sources] VCS Root: TestProject (13s)
[06:00:17][VCS Root: TestProject] revision: 50548_2017/02/01 08:12:59 +0100
[06:00:17][VCS Root: TestProject] Checkout from svn+ssh://blah
[06:00:17][VCS Root: TestProject] Using working copy format 1.8
[06:00:17][VCS Root: TestProject] Fast SVN update is enabled
[06:00:17][VCS Root: TestProject] Reverting local changes for working directory (3s)

Revert before update off:

[08:41:30]Updating sources: auto checkout (on agent) (9s)
[08:41:30][Updating sources] Will use agent side checkout
[08:41:30][Updating sources] VCS Root: TestProject (9s)
[08:41:30][VCS Root: TestProject] revision: 50548_2017/02/01 08:12:59 +0100
[08:41:30][VCS Root: TestProject] Checkout from svn+ssh://blah
[08:41:30][VCS Root: TestProject] Using working copy format 1.8
[08:41:30][VCS Root: TestProject] Fast SVN update is enabled

There is no "Reverting local changes for working directory" anywhere in the log. It's not reverting changes at any point. I know that this particular build does some modifications in the versioned code so those should be reverted according to documentation in https://confluence.jetbrains.com/display/TCD10/Subversion#Subversion-Checkoutonagentsettings

In any case, keeping the option on does right thing (updates&reverts, or reverts&updates, before starting the build), and that should be default IMO.

Alina Mishina

Created February 02, 2017 12:38

Hi Joonas,

"Revert before update" is correctly described in the documentation. In the first log the changes are reverted before checkout. The line "Checkout from svn+ssh://blah" shows the checkout path, however the checkout process itself is performed after the revert. The log can be a bit confusing.

If "Revert before update" is disabled, then only local modifications detected during the update process (not during the build) are reverted.

Permanently deleted user

Created February 02, 2017 15:03

Ok, then it's just the log that's not quite clear about in which order things happen. Thanks!

Please sign in to leave a comment.