version-control

Any Mercurial extension to grep for newly checked in code (not having "console.log")?

Is there any Mercurial extension that can grep for "console.log" that might have been accidentally left over as debugging code? Right now this is what I am doing: 1) hg out ssh://.... the above is to see what is the first committed revision in my local repo, say, the smallest revision is 3456 2) hg diff -r 3455 | grep "^+" | grep ...

Source control in Visual Studio 2010?

After doing some search on SO, Google and MSDN forums I've become frustrated that there is so little information for what might seem like an obvious question and possibly a dumb question. I need to use source control in Visual Studio 2010 Professional. I do not have separate Team Foundation Server 2010. Some people have mentioned Source...

What is the purpose of the vwd.webinfo file in an ASP.Net Website Project?

I have an ASP.Net 2.0 web project, which is setup is a Web Site (a file system web site I believe, though not sure). One file that keeps changing very often, ot it's own, is the vwd.webinfo file. It is located in the root folder of the project, and this is what it looks like: <?xml version="1.0" encoding="UTF-8"?><VisualWebDeveloper> ...

How to tag a scientific data processing tool to ensure repeatability

Dear all, we develop a data processing tool to extract some scientific results out of a given set of raw data. In data science it is very important that you can re-obtain your results and repeat the calculations, that led to a result set Since the tool is evolving, we need a way to find out which revision/build of our tool generated a ...

Database source control vs. schema change scripts

Building and maintaining a database that is then deplyed/developed further by many devs is something that goes on in software development all the time. We create a build script, and maintain further update scripts that get applied as the database grows over time. There are many ways to manage this, from manual updates to console apps/bui...

Can you merge and push another branch using git?

My current process is: git checkout dev make changes and commits (& push to development branch on origin occasionally) git checkout master git merge dev git push origin master git checkout dev Would it be possible to instead merge from the development branch to master without checking out the master branch? And then would it be furt...

Verbose p4 sync

In the visual Perforce client (p4v) there is an option: Show p4 command output for file operations When it is enabled, in the log pane I can see detailed logging like this: p4 sync /Users/az/ftp/...#head //depot/ftp/inc/PICHNL.H updated /Users/az/ftp/inc/PICHNL.H //depot/ftp/src/ftpprot.cpp updated /Users/az/ftp/src/ftpprot.cpp 2 ...

Should external dependencies be fixed, during development?

My team and I are working on several projects that collectively depend on some common libraries. These common libraries are currently checked out together with the projects, using svn:externals. The question is, should the projects' trunks track the HEAD of each library, or be linked to specific revisions? The issue libraries are very ...

showing subversion history recursively below subfolder/path

Hi, svn help log doesn't give me an option to see the history recursively. svn log -l3 --recursive SVN_ROOT_URL does not work. I would expect that it gives me the last 3 commits below SVN_ROOT_URL. This is really annoying. I always have to start my IDE or look at team-city to see the last commits on a project (though I am not sure whi...

Subversion and dependencies

I am trying to find a viable strategy to a following problem. We have several web projects which are dependent on our framework. Everything is stored in our SVN and has its own project with all the necessary directory structure (trunk, tags, branches). In an example - we have projects webprj01 and webprj02 and we have a framework frm01....

git pull: permission denied

hi, I created a repository in my desktop and push to github, then clone that repository to my laptop to make development, later committed the changes and push to github. now back to my desktop, i tried 'git pull' to get all the changed i made, it showed the error message: Permission denied (publickey) fatal: The remote end hung up unex...

Why does a file checked into CVS become double-spaced?

Problem Frequently (but not every time) when using CVS to check in files like: .java, .cs, .xml, etc, every line of the file is gets a carriage return. Example: File before check-in by a team member: // Begin file class Foo { public Foo() { // Do step 1 // Do step 2 } } // End file Fil...

Best Tool/Method to Keep .Resx and Designer.cs Files in a Consistent Order

I work in a development shop with about 20 other developers. It's really a chore to have to merge changes to a Designer.cs file or a .Resx file, when 50% of the changes just involved a change in ordering of the same code in two updates. What do other development teams do to keep these files in order, such that when two people make chan...

How to use clearfsimport to import files into an empty VOB

I created a VOB and a snapshot view that loads it. The VOB is empty and I wanted to add some files to initialize it, but I got errors for all files that I wanted to import. Here is the details. The VOB is created by this command: ct mkvob -tag /vobs/sqlite -comment "testing VOB for Sqlite" -public /var/clearcase/vobs/sqlite.vbs The v...

Hg: Update on a line-by-line level?

I have a bug that is present in one changeset but not its parent. Is there some functionality in mercurial where I can "update" in smaller increments, to see where the problem starts? For example, if the diff is a change in functions A, B, and C, I would run the test suite after making each of those changes, to try to diagnose the probl...

Automatically triggering merge activity after remote on-site (custom) development?

In our office, the software we create is sent to our client's office along with an engineer and a laptop. They modify the code at the customer site, based on the customer requests, and deploy the exe. When the engineer returns to the office, the changed/latest code is not updated to the server, thereby causing us all sorts of problems ...

Deleting/"Rebasing" rails migrations

Hi guys, I've been working in a git branch on one portion of a rails site. I've made a lot of random changes to the schema while iterating, and I've made some migrations that revert previous migrations to add columns and things like that. Is it OK to delete redundant migrations like those (i.e. pairs of migrations that are just reverses...

Merging between SVN branches

I've been working on a feature in an SVN branch for a while. Periodically, I merged changes from trunk into my private branch so I could get everyone else's changes using the procedure described here. That seemed to work fine. Now I'm ready to merge my changes into trunk. I'm trying to do this by merging the range of revisions starting ...

One big checkin or several smaller ones?

Yesterday when i checked out the latest version of our internal tool i saw about 30+ new versions. This got me curious since i thought that somebody finally fixed those annoying bugs and added that feature i was waiting for so long... and guess what? None of this happened, someone just thought it would be nice to update some headers and ...

Applying ISO Procedures to code changes

I'm looking for a way to enforce ISO standards on developer code checkins. This boils down to auditing each change to the codebase so that I can tell: who made the change when the change was made what project the change related to what work item the change related to We're doing .Net development using Subversion for source control an...