Im trying to apply serial patch files (like 22 serial patch files) and when I have a merge issue using tortoise, patch stops, i manually fix the conflict, but the patch never resumes.
Anyone knows a good tutorial or video that explains how to do it with tortoise git? (using latest version)
Tx!
For future reference, this is the best that I have found
https://tortoisegit.org/docs/tortoisegit/tgit-dug-patch.html
Related
I see https://patchwork.kernel.org/.
I have an old question.
Various *.patch files for the linux kernel are available on the Internet.
However, I can not tell which kernel version I created the patch file with.
For example, there is https://patchwork.kernel.org/patch/6509121/.
At the bottom of the page is a patch.
Can I find out which Kernel version or git version patch file this patch contains?
I wondered about https://patchwork.kernel.org/ or any other source code.
What rules are there?
Or should anyone try to apply it with patch files?
I would like to implement a Rake task that automates some of the tasks I have to do to move my changes from development to production (and yes, I know there is something out like Capistrano, and it is way too much for me). In the center, there are some interactive commands like git add -i and a series of commit and push. On the production side, there will be pulls and assets tasks to do.
It is tedious to type in all the time the same commands so I would like to automate it completely. What I have not found is the Ruby API for Git.
It should work under Windows 7, and allow at least the following commands: git add, git status, git commit, git push, git pull.
I know, bad habit, but I would like to document the experiences of this weekend:
There is a similar question on https://softwareengineering.stackexchange.com/questions/62843/best-ruby-git-library that names the 3 relevant candidates: Git, Grit and Rugged.
Git and Grit are not developed further, Rugged is currently developed, but not finished.
Git works out of the box, but has some deficiencies:
There are known shortcomings (see the issues).
I had the problem, that added and changed items are not well matched, they can be in only one of the 2 states (which is not true for Git currently).
The API is reasonable, and works well in console, Ruby script or Rake task.
Grit did not work for me at all, and I did not found the reason. I got stack traces (low level ones), and tried a few patches that could be relevant for usage under Windows 7, but with no success.
Rugged is not installable for me, so I filed a bug to rugged which got some feedback. The problem seems to be that rugged only works for POSIX systems, so it is not compilable with DevKit for Ruby.
So I will try to find a compiled version of libgit2.dll for Windows 7, and will try to use that. I have done that in the past with sqlite3.dll, so perhaps that is the best try. For me, rugged is the most sensible solution, because there are people behind that project, they are interested to provide a solution that works cross platform.
This one seems to be quite popular. If you are more interested in GitHub then you might want to look at this one.
UPDATE:
Rugged seems to be the newest one out there though the Gem for it has not been built in a while. Might be best to use the source from Github.
July 2013 update:
It looks like Rugged is the tool of choice at the moment. It is being actively maintained and it looks like most (all) of the core committers work at github.
Even though grit is the most popular, and is created by one of the github founders, it hasn't been touched for 5 months and has had little activity.
See Ruby-Toolbox for details.
We are using that exact version and I believe I've hit a bug that I might need to fix, however the 2.1RC doesn't fix it, and I don't want to break all dependencies to other frameworks (Windsor for instance) for an upgrade.
They have however removed the SVN repository that contained all tags, and the new git repository doesn't contain any tags at all so I have no idea which revision I should check out.
Does anyone know where I can find the source code? I have an old version for 1.0.3 on my drive but that is of little use now...
To answer my own question, they seem to have put it in a readonly git repository and branched it for 2.0.0 here:
https://github.com/castleproject/Castle.MonoRail-READONLY/tree/2-0-stable
I am trying to show line numbers in an NSTexView. I was using the solution from http://www.noodlesoft.com/blog/2008/10/05/displaying-line-numbers-with-nstextview/ but it is no more working with Lion.
Do you know an alternative solution?
I think you probably need an updated version of the files for 64bit (Lion).
I forked the NoodleKit project on GitHub and made some changes that I found on the web. I made some small tweaks, but the changes here mostly came from others on the Internet and the original repo. The owner of the repo has not updated the NoodleLineNumberview in two years, but I may send a pull request so he will add it to his repo. These classes are working in my Lion projects, so they should work for you.
Update your project with these new files and then try to compile:
NoodleLineNumberMarker.h
NoodleLineNumberMarker.m
NoodleLineNumberView.h
NoodleLineNumberView.m
If you are using the MarkerLineNumberView that came with an old version of the project, then that will not work here. Just replace those objects with NoodleLineNumberView.
Is there a decent Subversion client available for XCode? I am so tempted to write my own as of this morning after having a conflict on an update. I've done merges manually editing the ">>> mine" and "<<< theirs" markers but there has GOT to be a better way in this day and age. Does anyone know of an easy way to resolve conflicts graphically? It seems like SCM conflicts and svn history queries are my two most missed features in all of the Mac SVN clients I've seen so far. I use Versions and sometimes the built in XCode SCM support. I've also looked briefly at Cornerstones web site. (Is Cornerstone any better?) Does anyone have any ideas?
I'd suggest using git-svn with GitX for most things. The GitX commit interface is so nice it's really hard to go back to anything else.
For conflicts I use Emacs, which offers really nice, fully editable, color-coded 3-way merge.
You also might check out the WWDC 2010 videos/slides (free at Apple's site if you're a registered developer) regarding SCM support in the upcoming version of Xcode.
As a GUI, SmartSVN offers a basic conflict editor (though I find the the application very slow to refresh on a large source tree). Often I find myself going back to Emacs which has support for subversion via Psvn.el, and that has a very capable 3 way diff with ancestor revisions, custom region skipping and other goodies.