versioning

I am building a Rails app that I manage with Git. All is perfect, but I'd like keep a public version as well as a private one. That is: the public version is for a public repository (for people to use), and the private version is for my own site. The idea is that both versions should be up-to-date, with the difference that my private version's files contain passwords for my site, and the public version doesn't (or contains some default values as such). I've been thinking of branches: master (the public version) and some private one. But it seems that I'd have to do a lot of merging after each

I have two Mercurial repositories that are for different major revisions of the same project. The latter version is a massive change to the functionality, and especially the UI, of the project, but it will still have a lot of common code with the earlier version. (For shorthand I'll call these versions 4.6 and 5.0 and the repositories project-4.x and project-5.x going forward; that's basically what I'm dealing with.)[1] As we thought more carefully about the structure of our repository, and thinking especially about how to handle the related code, it became apparent that we wanted to simply

This question is about etiquette and open source projects. I have forked an application from github and added two new features. The first feature has been request frequently elsewhere. I have added it. Code & implementation are clean (I think). The second feature is more of a hack. It will be of use to others, but the implementation is a little dirty in useage and more so in code. I need the feature but I don't have the skills to fully implement it properly or to a level that could be considered a worth while contrabution to the main project. How should the versioning work? Do I just bump up

With a .NET Framework library you could specify a version with a wildcard and NUGET pack command would append the build date and version automatically when running a NUGET Build Task in VSTS. [assembly: AssemblyVersion("1.0.*")] NUGET PACK would generate a NUPKG file with a version like 1.0.6604.1234 appending the date number and a build ID. NET Standard issues In .NET Core and .NET standard the new .csproj format does not support this wildcard format. We can't package with Nuget.exe (reason: this issue ) but we can use dotnet pack except I need to auto-increment the build numbers. The dotnet

Well, after many hours of reading and trial and error, it has finally hit me. Mercurial doesn't really want to do SubRepos...at least not with TortoiseHg and Bitbucket. If I am mistaken, and you don't want a down vote for a rude response similar to "of course it works, didn't you read the official docs", then please provide a simple example of how to do so via TortoiseHg latest that will successfully push to Bitbucket. Maybe a open source project that utilizes mercurial and bitbucket and subrepos? All that said, if we keep our class libraries in seperate repos, and the recommended approach is

I am currently trying to figure out, how to do release management with git flow in a scenario where I have one git repository with about 15 projects in two solutions plus scripts for the database. Each solution basically contains one project that will result in an executable and more than 10 projects containing base functionality used by both solutions like DAL, SAP access wrapper etc. Solution one is an application with UI for the users. Solution two is a Windows service. The release of the two solutions and the database are not in sync. This means that frequently only one ore two of the

Notice in the bottom right hand corner of this page it has the SVN revision id? I'm assuming that's dynamic. I'd love to add that to some of my sites, just as a comment in the source to make sure code pushes are going through. NOTE: You can also assume that the working directory of the site in question is an svn checkout of the repo in question. Edit: I'm looking for the global revision number, not the revision number of the file I'm looking at. You can use the svnversion CLI utility to get a more specific look at the revision, including the highest number. You could then use regular

I have been facing this problem for sometimes now, a laziness caused in part by the fact that Microsoft Office automatically save files you are working on with versions and automatic recovery. Many times when I am starting a new notebook in mathematica to do some tests or whatever, I often forget to save what I am doing. Every now and then, depending on the computer I am using, the computer crashes and all the beautiful work I was doing is lost forever... Is there a way to get around this other that manically saving my files every five minutes? How about file versioning? BTW: Using MMA V8