Unfortunately I did several times git reset --hard HEAD^ losing a quite big chunk of code in several files. Is there a way to restore those commits or in this case to forward where the HEAD was before, so I can bring up those lines that I lost? ...
I have a problem that seems very simple but is hard to solve. I get the mentioned error after deleting a directory. I did not find a solution yet to solve the conflict. This is how it occurs: svn add dir svn add dir/file1 svn commit svn add dir/file2 svn commit svn delete dir svn commit --> commit failed --> Directory '/dir' is out o...
I have been working on a branch and have made some commits. Now is there some way I can see in TortoiseHg if those commits have been pushed or are they still just local? ...
After a big refactor involving creating new projects and moving files around between them, I am having a big problem committing a folder (and its contents) which was moved. The folder currently shows as modified (i.e. red overlay with exclamation mark). When I try to commit it, I am told I need to update the working copy first. When I...
I had checked out a few files from the svn repository on an old machine, and then I moved the repository to a new server. I did not do a repo dump and move, just did a tar and scp and untar of the entire repository. When I try to check in to the new server [with the same hostname and same dir structure] it says: svn: Commit failed (d...
Hello all, I am trying to set up a MySQL transaction such that I can loop through a bunch of queries (see below) and if any of them fail, rollback all of the changes. I am finding however that if one fails, not all of the queries are rolled back. Am I doing anything wrong here? mysql_query("START TRANSACTION"); foreach($array1 as...
I wanted to move our existing repository (from location A) to a new linux server (location B). So, I created a new repository in that server (location B) with the command:- svnadmin create --fs-type fsfs <repository_name> Then I copied the db folder from location A and overwrote that of location B, because I want to keep the previous ...
I want to be able to print out all of the changes to the code since a certain date. Without manually copy and pasting the information from all the commit logs, is there an easier way to get all this information into a central location? ...
Hello we are using CVS and development takes place regularly. I work only on one-three files most of the time. Do I still have to commit all the changes in the folder?? Is it possible to select the files which have to be committed and not allow the CVS to commit files which are still in development?? As in file 1, file 2 and file 3....I...
hi i want to commit only the property of a folder not the locally modified files inside it. when i am using svn commit it is commiting also the modified files.please tell me how to get this . thanks ...
Currently, I am not able to commit with the SVN user I added. I tried by manually editing the svnserve.conf and passwd files. I did the following - Added a line harry = harrysecret in passwd - Uncommented the line password-db = passwd in svnserve.conf - Added a system user harry with password = harrysecret as follows:- useradd harry ...
Hello, There's a regression in Qt 4.6.2 on Windows (setting border color from stylesheet does not work) that I decided to fix myself. This bug was originally reported in Qt 4.4, and was fixed in Qt 4.5, around December 2008. Unfortunately I cannot find the corresponding commit in http://qt.gitorious.org/, probably because the commit is...
A Git SHA ID looks like this one 351e11dac558a764ba83f89c6598151d2dbaf904, it is a long hex number. But how should it be detected in a text? Search for "words" which only contain 0-9,a-f and have a length of at least 20 characters? But how to distinguish SHA IDs from normal words? ...
I half realize that this question is probably asked already, but I'm not familiar with the jargon and I need a really easy to follow answer perhaps a little too specific to my particular needs. I forgot to remove the object files and then performed a git add -A. I then scanned a few man pages and used some kind of interactive mode and a...
I'm new to hibernate. I have a transaction that fails with a HibernateException, yet the table is altered after the commit. Here is the code: public StoreResult store(Entry entry) { Session session = HibernateUtility.getSessionFactory().openSession(); Transaction transaction = session.beginTransaction(); try { ...
Hay, I've only just started to use GIT and think its wonderful. However I'm a little confused over what the 'merge' does. Say we have a working project in the brach called A I got home and make changes to this brach and save it as B and another programmer makes changes to A and saves it as C Is there any way to merge the two branches ...
Hello I am using a custom library which has a lot of files. Now in order to use that library I need to add all the files of that library to the local CVS. So when I cvs update, it shows me all the files that are unavailable on CVS, and this library has a lot of files. So I have to cvs add first to add files to cvs and then commit. Is the...
Ive created a program that needs to commit to repositories. I'm using slikSvn. It seems that the very first commit I make is very slow (20 sec) but every other commit is much faster more like 1 sec. Is there some kind of connection to slikSvn I can make when I first load my program to avoid this 20 sec commit? Please let me know what ad...
Hello, Everytime I do git status there is this folder that appears as untracked. $ git status # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # src/error/ nothing added to commit but untracked files present (use "git add" to track) Even after doing git add ., git commit...
This is the situation: I've lost some work in my git repository, this work was once commited, but is now burried in my history, somewhere that might be unreachable by 'git log --all'. The only thing I've can remember is some distinct string that could pinpoint a file that is part of my work at this time. I've got a solution... but it is...