Is there a useful command-line diff utility for VSS 2005?
I tried this but if wants to compare my current directory with, it seems, some randomly picked path from the project.
We are currently using DeltaXML in our .Net application to analyse two versions of .xml files regarding their differences, but since DeltaXML is a java application/library, we're looking for a more homogeneous way to accomplish that task.
Does anyone know a .Net diff library similiar to DeltaXML?
I can't find anything like that. Commercial or free ( XSQL Lite is suitable for my case and ) tools show diffs in grids with possibility to export to CSV. Also they generate sync SQL scripts when run from command line. What I need is an output as a comprehensive report ( XML , HTML ) suitable for parsing so that I would be able to show similar…
How do I diff two files in MSBuild? I cannot find any specific task to do it.
If possible, is it also possible to exclude certain rows, or patterns in the files eg.
2009-12-09T10:03:07.6888125+02:00
I just started using git with github. I followed their instructions and ran into errors on the last step. I'm checking in an existing directory that isn't currently source-controlled (project about a week old). Other than that, my use case should be pretty run of the mill.
Here's what's happening:
$ git push origin master
error: src refspec…
We use git (github) and capistrano (like 99% of the Rails shops out there) to deploy our app to production.
What I'd like to do is, after every cap * deploy generate a text file containing all the git commit comments since the last deploy. I can then take that list of commit comments, clean it up, and put it somewhere for consumption.
"git…
I know how to view all changes in a changeset..
But let's say you update your source, you do a pull and you get 3 new changesets. How can you compare the current state of the remote repository (with the 3 changesets checked in) vs. the current source (on your local machine)?
I'd like to do this using the visual diff tool which I…
Anyone know of any pre-existing tools out there what will highlight differences in output when running Django tests?
I'm comparing some JSON output and it's tough to find things like extra spaces. I was about to just copy and paste this into an existing diff tool but I figured this might be on someone's radar.
I have been an iphone developer for a while, and I have recently been including git in my workflow. I have used git settings found on http://shanesbrain.net/2008/7/9/using-xcode-with-git for my workflow so far.
Those settings tell git to exclude *.pbxproj from merges? Is there a real reason for doing this? For example, when I add…
I am currently working on a checked out SVN project along with some plugins for that project. I want to keep all of this work - including the current version of my SVN checkout within a single git repository.
I thought I had achieved this by checking in the SVN working copy to git. However, when I did a pull on a new computer the…
The git command
git log --format='%H' --follow -- foo.txt
will give you the series of commits that touch foo.txt, following it across renames.
I'm wondering if there's a git log command that will also print the corresponding historical file name beside each commit.
It would be something like this, where we can interpret '%F'…
So I am trying to switch to git, by using git-svn. I am having a svn repo called myrepo from which I want to clone just the project called myproject. The thing is that by running the following command:
git svn clone path-to-repo/myrepo/myproject --stdlayout --prefix=svn myproject
the whole repo myrepo is cloned rather than…
I am trying to follow this instruction. I have a local git repo and when I do a git push, I need the repo to be pushed to my EC2 instance.
But, in the above tutorial, when I do a git push origin master, I get Permission denied (publickey) error because I did not specify the identity file.
Say, I login to EC2 like this: ssh…
I am currently developing a java program where I need to show the difference between two text.
Is there any library available for visually show the difference, that is the diff output in my java program or how can I do so. Any suggestion will be very helpful for me.
I am trying to merge a local branch into the master branch without having Git to do an automerge. I would like to “hand pick” what I would like to be merged into master.
When I use Git’s difftool command, I am able to diff and select what I want to be added into the master branch. But then when I do a merge, I will lose…
I have my Git repository hosted at github.com. I would like to push updates and such to github.com and then log into my Windows server and do a git pull to get my changes (that are verified to work on my local machine. Ideally I should have another server setup as my local machine settings are different from the live…
I made a commit of my repository a week ago but never actually pushed it to the remote at github, which I did today. However, in the time from my commit I made many changes to the source. But just the initial commit was pushed to remote and while doing it, it also overwrote my local files.
What can I do to get back…
I want to run JSLint before a commit into either a Mercurial or Git repo is done.
I want this as an automatic step that is set up instead of relying on the developer (mainly me) remembering to run JSLint before-hand. I normally run JSLint while developing, but want to specify a contract on JS files that they pass…
Hey guys,
In Git I can do this:
1. Start working on new feature:
$ git co -b newfeature-123 # (a local feature development branch)
do a few commits (M, N, O)
master A---B---C
\
newfeature-123 M---N---O
2. Pull new changes from upstream master:
$ git pull
(master updated with ff-commits)
…
I often read that hg (and git and...) are better at merging than svn but I have never seen practical examples of where hg/git can merge something where svn fails (or where svn needs manual intervention). Could you post a few step-by-step lists of branch/modify/commit/...-operations that show where svn would…
Here it's the story... we have a Github account.
I clone the repository ... then I can work with it, commit things, push things, etc ... I use Linux with command line and git version 1.7.7.3
Then other user, using Eclipse and git plugin for eclipse eGit 1.1.0 pushes something, and it appears in the github…
I am planning my directory structure for a linux/apache/php web project like this:
Only www.example.com/webroot/ will be exposed in apache
www.example.com/
webroot/
index.php
comp1/
comp2/
component/
comp1/
comp1.class.php
comp1.js
comp2/
comp2.class.php
…
In short: Is there a way to disable storing full history for specific folders in git-svn repo?
We have pretty large SVN repo with big checkout. I would like to migrate it to Git for my local development, because Git speeds up update and status commands orders of magnitude.
When I simply do git svn…
I have been searching the web for best practices, but don't see anything that is consistent. If you have an excellent development process that includes successful releases of your product as well as hotfixes/patches and maintenance releases and you use git.
I would love to hear how you use git…
In Mercurial I can do this with the bundled Purge Extension and executing the following command:
hg purge
Also good to get rid of ignored files:
hg purge --all
I'm curious about the most practical/used equivalent solution in git.
Edit: I want to just get rid of the untracked files, not…