Hello, I have a problem when I try to do a git svn rebase on my repository. It displays : Checksum mismatch: code/app/meta_appli/app_info.py expected: d9cefed5d1a630273aa3742f7f414c83 got: 4eb5f3506698bdcb64347b5237ada19f I searched a lot but haven't found a way to solve this problem. If anybody knows, please share your knowledg...
Am I right thinking that Tigris.org have stopped maintaining their SVN binary package for Windows including Apache 2.x compatible package? It isn't listed any more on the Download page. It's very interesting why does it happened? What alternatives are there now? Only SlikSVN? Does it have any differences with old Tirgris SVN? And how t...
Hello, I'm looking for an simple SVN solution for my company. Currently we're not using any version control. We would like to install a server app on one of the computers in the office and use it over the LAN for 3 users. We develop websites using Visual Studio. Any suggestions? ...
svn: In file '/SourceCache/subversion/subversion-35/subversion/subversion/libsvn_ra_svn/marshal.c' line 486: assertion failed (opt || cstr) I get this when loading a project in Coda, but no error from the command line. Output from svn status -u; russ$ svn st -u Status against revision: 5772 Any ideas? svn cleanup does...
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 graphica...
I have a project which was branched, and a bunch of files (F1) were moved into a different directory and changed (F2). Now, I want to merge the branch back to Trunk and keep revision history, but I want to keep both F1 and F2. Is there a way to do this in subversion? ...
I'd like to replace my svn repository with git. Unfortunately I can't do this in one shot and to cut a long story short, I need to move an svn repository, with history, into a subdirectory of a pre-existing git repository. So I currently have: svn: svn1/ svn2/ git: git1/ .git/ gita/ And I want: svn: svn1/ git: git1/ .git/ ...
I'm new to git, coming from SVN world. So far, it seems a lot more useful, but I am still working out the kinks. Currently, my workflow is like this: make changes > git add . > git commit > enter log message What I don't understand is why I seem to have to add all of my files before I commit. They are under version control already? ...
So I've run into this issue. First of all, the GitHub page seems to indicate that this only affects Windows machines. Is that true? I'm experiencing the problem when doing a fresh clone of a migrated repo on OS X. Secondly, if I do what is suggested in this fix, I end up modifying thousands of files. The problem is that when I look at t...
This is maybe unusual so let me set the scene: We have an SVN repo containing our project history - an embedded system based on Linux. The SVN repo contains Linux kernel, U-Boot, busybox etc. sources and all our in-house apps, filesystem and such. The Linux kernel we have is old and crusty and I am working on porting to the mainline, w...
Hello all, I am maintaining a project on googlecode. I am using svn and I am happy with that. However, a new contributor would like to use Mercurial. I am ok with this this because I think that it is a better choice when working with different people. So I am to the point to migrate my googlecode project from svn to hg. I would like ...
Is there a Eclipse plugin to get an update notice if there was a comit in the SVN? In realtime? The SVN server I'm using does not provide any RSS log via Track or similar. ...
On windows i created a multi-file diff with: svn diff > mydiff.diff Then moved it to linux machine (with the same version of the same repo, no changes). How cai i apply it? After executing patch -p0 < mydiff.diff I get the following output: patching file licstat/test/unittest/test_licstatactioncontainers.cpp File licstat/test/uni...
I'm new to svn and I'm a bit confused with reintegrate function. When I started to develop new feature I created branch of my project. Then I committed some revisions and now I want to reintegrate it back to trunk. When I do this it appears like single commit in trunk branch. But I want to see all history of revisions of feature branch ...
I am very new to Eclipse (Galileo, Eclipse IDE for Java Developers) and working on my first Android app, but have used SVN on many other kinds of projects and development. Last night I took my first crack at pushing the new source into a shared repository (at work) and then pulling it back down at home. Based on an SO question/answer, ...
When attempting to commit changes to SVN, I receive the following error: Error: Commit failed (details follow): Error: While preparing 'C:\Users\dan\Documents\Visual Studio Error: 2008\Websites\admin\trunk\bin\SmtpDotNet.dll' for commit Error: Can't write to connection: An existing connection was forcibly closed by the Error: remote hos...
I have a big subversion repository and I discovered that many .py files (and maybe others) do not have the proper line endings, generating problems when checked out on different platforms. How can I solve this without repairing them one by one? Also how to I prevent others from corrupting the repository? ...
I accidentally selected "Exclude from Subversion" from the VisualSVN menu on my VS2008 project root. I have not updated or committed so I still have both the repository and local versions available. I need to know how to re-include the excluded project. Thank you kindly. ...
Is there a way to check the last checkout time of developers on a svn repository (something like an admin command). Would like to track on usage patterns related to frequency of checkout. ...
Hi - something that should be so simple in .net seems to be oh-so-hard. I have a project called MyExtenders, containing a few simple extenders to basic types. Many projects use MyExtenders - and so in traditional svn checkout and build approach I add MyExtenders as an svn:external with the revision locked to whichever it was last built...