Scenario:
I have a bug to fix in changeset 100. We currently have 125 changesets. I also am in the middle of some large changes. We have a production bug to fix.
Requirement
To put my current changes on hold
pull up the code from changeset 100 (the current production code
base)
Fix the bug. Recompile. Deploy.
Resume my work from point 1. And also ensure it includes the bug fix.
Presumed Process Flow
Shelve Pending Changes to server (not locally...just to make sure the changes are safe.
Source Control > Get Specific Version and get change set 100
Fix the bug....now I'm not sure of next steps..
Check in; unshelve? OR
Check in; Get Latest (which will bring me up to the last change set 125) , then unshelve?
And how does the fixed bug code get merged in?
Related
When working with a helm super-chart (umbrella chart) that consist of several sub-charts:
1 / if we attach a post-upgrade hook to one of the sub-chart, I wonder what is the expected behavior when running helm upgrade on the super-chart ?
1 - a / Assuming the sub-chart that contains the hooks has no changes at all, and there are changes in other sub-charts that do not have the hooks. Is the post-upgrade hooks supposed to be executed even tho, the sub-chart has no changes at all ?
Here is why i am asking the question:
In my understanding hooks are associated to release,
and sub-charts do not have their own release but are part of the umbrella chart
release. Hence, a post-upgrade hook should be executed only, if the
chart of the release changed and an upgrade is actually applied. By
that reasoning it would mean that (1) either hooks should only be
attached to the umbrella chart which has a release, (2) or if
attached to a sub-charts and it works nonetheless, then the hooks
would be fired anytime the upgrade command is applied on the super
charts. In other words, there would be no way to say, run the hooks
from that sub-chart, only if that sub-chart changes. That is, the
super-chart which is the only chart that yield a release, can be
subject to an upgrade, whenever any of its sub-chart changes. If
hooks are indeed strictly associated to release, even if that hooks is located in a
sub-chart, it would get triggered whenever the release to which the
sub-chart is part of is upgraded.
So far in our experiment we have attached the hooks that are related
to specific sub-chart in the super chart. It works but it is
annoying, because they are executed all the time, even when the
associated sub-chart did not change. We would to change it and attach
it to the sub-chart. However the spec does not say what is the
expected behavior, hence the question, so if/when experimenting, we would know if the
behavior that comes out, is the expected one or the result of configuring
something the wrong way.
In my internal gitlab site there are a lot of repositories and I want to find repositories which don't' have commits for so long .
In order to do this , I searched as last updated but it's not accurately reflect , looks like it's a bug .
That could be similar to gitlab-org/gitlab-foss issue 56227:
For example, I have a project testing-dev-project in a group.
It displays that it was last updated 1 week ago.
Using the inspector, the time is Dec 28, 2018. However, if I query the project with the API, I get the "last_activity_at":"2018-10-26T12:46:34.372-07:00".
You can also check by going to the Project -> Activity or Project -> Settings -> Audit Events.
But:
This has likely always been the behavior - if a database migration touches something in a project then the updated_at timestamp is automatically updated by Rails.
This is also mentioned in gitlab-org/gitlab issue 25862: "Show project creation dates when sorting group page on this attribute"
For some reason, updated_at was updated fairly recently. I suspect a migration such as the one that encrypted the runners token column may have touched every project.
As a result, the updated_at column may have been updated recently, and the projects appear to have been touched more recently than they should.
Last updated being out of order due to the issues described in gitlab-org/gitlab-foss issue 27181
That last issue is the most relevant, still opened, and finishes with:
The discrepancy between the actual sort order and the displayed updated time is due to the fact that it displays the project's last_updated_date value, while sort is based on last_updated_at.
It's not immediately obvious to me why these values are so different, it seems like they should be very close.
I've submitted a MR that sets the list to display values from last_updated_at, though I'm not sure if a better long term solution would be to change the triggers that set last_updated_date and use that for sorting instead.
This issue is moved to gitlab-org/gitlab issue 17017.
See also GitLab 14.10 MR 82488: "Project list: order by real last update"
We have a complex scenario which requires a timer job to run after content deployment to a SP 2010 site collection. The timer job automatically deactivates/reactivates a branding feature which is responsible for setting the master page for the site collection, among other things.
We have had several feature upgrades along the way, and neglected to call .Update() on the feature in that specific site collection. So all of the updated CSS, master page, page layouts etc. are out of date on that SC.
The strange part is that when I checked the version number of that feature in this SC, it shows as the latest version. The custom upgrade action clearly didn't run and update the files, because nobody called .Upgrade().
One of my colleagues suggested that the deactivate/reactivate process done by the timer job would update the version number, meaning that I can no longer call Upgrade()!
Is that true? Does a deactivate/reactivate cycle for a feature automatically update the feature version number?
Is there an easy way to fix this mess? Some way to decrement the version number programmatically, then call Upgrade()??
On 1: No. Feature deactivating / activating does not trigger an update. See this article by Chris O' Brian: http://www.sharepointnutsandbolts.com/2010/06/feature-upgrade-part-1-fundamentals.html
Feature upgrade does NOT happen automatically (including when the
Feature is deactivated/reactivated)! The only way to upgrade a Feature
is to call SPFeature.Upgrade(), typically in conjunction with one of
the QueryFeatures() methods. My tool which I’ll go on to talk about is
a custom application page which helps you with this part – note there
is no STSADM command, PowerShell cmdlet or user interface to do this
out-of-the-box.
Is your timer job cycling the feature activation with Force? Then, yes, it is triggering the feature upgrade/feature update see the following screenshot from SPFeature.Activate (see my yellow marking):
Why the feature version is incremented, I'm not sure. When you have a feature, install a new feature version and activate / deactivate, the feature version stays the same unless you run an Upgrade, see also this related question stating the same: https://sharepoint.stackexchange.com/questions/41476/feature-upgrading-question
I'm guessing your timer job is using force? Otherwise I'm not quite sure what is happening.
On 2: Don't know if it is possible to decrease the version number, but the safest way would be to just create a new version including a grand "clean up" feature receiver which sets everything correct, i.e. checks which steps of the feature upgrade have happened already (e.g. new list created, new content type added) and which haven't. Depending on that just execute the same steps again which have not executed yet. For the latter part you can fortunately use the existing code, so you would only need the "clean up" or checking code.
After some testing I found that simply deactivating and reactivating the feature will increment the version number and completely screw up your upgrade! I even watched the update come through in the content database. As soon as you deactivate/reactivate the updated feature, the new version number pops into the content DB. Of course the upgrade doesn't actually run, it just increments the version number.
This means that if you then call .Upgrade() it won't work because SharePoint thinks it's already been upgraded!!
To fix this I updated the row in the content database to set the feature version back to 0.0.0.0 for that particular web and then I could run .Upgrade() just fine....but that's not exactly a supported solution. If anyone else has a better idea drop a reply.
Say, I have a project called example.vcproj to which I have added files:
1. first_file.c
2. second_file.c
first_file.c was added 10 days ago and has still not been code reviewed. Therefore I am still waiting for it and at this moment I cannot check in the files.
second_file.c was added recently. It has gone through the code review and is ready to be checked in. However since my first file is still on review, I am not able to go ahead and submit the second one, mainly because of the dependency on example.vcproj.
Please let me know the simplest way to resolve this conflict other than temporarily removing the first_file.c and reverting the example.vcproj and checking in the most recent changes. Thanks.
There are a couple of things you can try.
First, you can shelve all of your files prior to submit. That at least means you are in no danger of losing any work, as the files will be stored on the Perforce server. After you receive code review you can check them in.
Second, you can create a private branch or stream for your work-in-progress. Then whenever you hit a stable milestone on your private branch, you can get code review approval and promote it to the shared branch.
I am using my ccnet which is configured with the clear case
and everything is working fine as expected,but i am unable to see
anything in the "ViewProjectModificationHistory".whenever i click this
tab,i see a message which tells that :"No history Data found, make
sure you use the modificationHistory Publisher for this
project".Infact i had added under the tag.And to my
suprise,when i open this same link in the other persons system,it
opens well and fine and see all the modification history recorded.
So can anyone please tell me what could be this issue and how can it
be resolved?
Thanks and regards
Maddy
You should check your build history file. This will contain the XML data that feeds these reports. In particular, check the modifications/modification nodes to see if they are populated or not.
My guess is that the modifications are not there - so there may be nothing to display.
Another gotcha I have caught myself doing is not actually checking that there was in fact changes committed since the last time I built a project.