TeamCity not picking up VCS changes after server rollback - teamcity

We are using TeamCity 9.0.0. The server got corrupted for reasons not relevant to this discussion, so I had to rollback to a stable snapshot (we use Amazon AWS snapshots), which was roughly 12 hours old. I lost some of the builds that happened during those 12 hours but that's ok.
The restore seemed to work, but now the VCS Triggers are not happening. The VCS root is from TFS 2013.
I tried checkin in new changes and builds still don't trigger. I tried running the build manually and it doesn't pick up the latest changes.
It looks like something got out of sync when I restored the snapshot.
Thoughts?
--------Update 1 -------
I looked at the history and I see several builds triggering after I rolled back my server so I think that is not related. I tried creating a new VCS root and removing the existing one. I checked in a change and the build triggered fine. I tried a second check in and this time the build didn't trigger. It's almost like it misses some changesets.

Try cleaning Server cache at <TeamCity Data Directory>/system/caches. If even that doesn't work try deleting and re-creating the VCS.

Related

Xcode says local is out of date, but I am trying to completely replace the GitHub repo

I wrote a tiny application and checked it into GitHub. I then wanted to make it cross-platform, so instead of trying to build that out, I restarted with a new project and selected Multiplatform->Game. As part of this I made a new local repo, and once it was up and running, connected it to the remote.
Now the new project is very different than the old one. And so when I try to Push, it complains that "The local repository is out of date." I tried doing a Pull with Stash, and that happened without any errors, but I still get the same error when trying to push. A Refresh File Status indicates no changes.
Reading many (many!) threads here suggests that it should just work, you should be able to completely rebuild a remote just by pushing. So I suspect the issue is in Xcode? Any advice on how to get this code into the repo?
If you create a new repo and select a license, the resulting LICENCE file will always conflict with the local even if there are no differences. This is not indicated in the Xcode display, nor does github report any differences online or in the CLI.
So... if you are making a new repo, do not select a license if the project contains one.

Unable to Remove Pending Changes in TeamCity

We had an issue recently that caused TeamCity to stop running builds for several hours. The result was a large queue of pending changes. Now this has been resolved, and new changes are going through the pipeline with no problem.
However, the pending changes area still shows 43 pending. All of these changes have been included in subsequent commits, and have therefore been built. Why is TeamCity showing these old commits as pending? And how do I clear the queue?
I've had the same issue and found a way to work around it. Not ideal but worked for me.
Select your project. Click on Edit Configuration Settings. Select Actions and Copy. Create a duplicate copy of your project.
Now go through the process again only delete the old project instead of copying it.
This gives you a new project with the same setup and none of the history or pending items of the old one. Like I said not ideal, but will get rid of the pending items.

TFS Merging Development Branch to Main

Our team started using TFS few months back and we are learning as we progress. We first checked in our existing code to TFS thereby creating a Main Branch. We then created a Development Branch from this Main branch.
We just did a release and I merged Development branch with Main. It asked me to map Main branch folder on my workstation. Done that Merge completed successfully. But after merge I noticed on server that change sets are still old and source code on server has not changed.
looking further I noticed that the changed file is marked as 'merge pending'.
When I opened solution from mapped folder of main branch, I did see that all changes from Development branch merged to Main are in pending state.
Questions
Do I always have to check in pending changes after each merge in TFS
Is is possible to merge source code on server instead of from
workstation (All code in development is in Checked in state).
I am using VS2012 (if that matters)
Please advise, especially if I am taking a wrong approach with TFS.
In answer to your questions:
Yes, you always have to check in pending changes. Pending changes are local to your machine, they give you the chance to review the result of the merge locally before they are committed to the server. This is especially important because the merge may result in a conflict that you need to resolve before you can check in.
I don't think that this is possible (although I never researched this specific question). This is, again, because of the possibility of a conflict that needs to be resolved manually. Even if you perform a merge programmatically via the TFS API, the merge will happen locally.
Don't worry, you are doing the right thing. Only one word of warning regarding merges in general: Before you attempt a merge, always make sure that you perform a "get latest" operation on the target branch! The source branch does not need to be up-to-date on your local machine because the merge operation will get the source branch data from the server. But the changes will be merged with whatever version your local target branch files have, so if these are not up-to-date you will get unexpected results.

Jenkins does not attempt to update existing code. Clones every time

I'm attempting to get jenkins to build a project, but it seems to want to do a fresh clone everytime for some reason. I get this error:
none: ssh://hg#bitbucket.org/marc/repo/
which looks different than ssh://hg#bitbucket.org/marc/repo/
so falling back to fresh clone rather than incremental update
Is there something that would cause this? The two mentioned URLs are the same.
Turns out that with the debug option set to true (in the global jenkins settings for Mercurial) it will not update (but will clone), so this is a bug in the mercurial plugin for jenkins, but with a workaround that you can disable debug.
Your build probably changes some files/directories in the original structure of your local copy. Jenkins detects it and restarts fresh to be clean.
regards
didier

TeamCity StarTeam Updating Issue

We configured TeamCity to do nightly builds based on a time trigger at 8pm on a standalone VCS root.
The root is configured to pull the tip. It is also set to do a clean checkout every time.
Has anyone else encountered an issue where not all modified files up to the point in time that the configuration is triggered on will be included. So for example we had a nightly build at 8pm on 8/13/2009, a checkin at 5pm, one at 6pm, but when the build triggered at 8pm on 8/14/2009 some of the changes are included and some are not.
I might be missing something really obvious here, but the result is a "successful" build that does not include all the changes!
Any help greatly appreciated.
I'd recommend you to submit an issue at the bug tracker. Enable debug logging and attach the VCS logs for the problematic checkout to the submitted issue. Refer to the Reporting Issues document for the details.
Otherwise, it's hard to say anything without the version information and the logs. Such issues can be solved much faster via JetBrains tracker/support than here.

Resources