I have a Git repository originally imported from Subversion. Parts of the author/committer information are wrong, which is not Git's fault but mostly due to sloppy committing with Subversion. I would like to use git filter-branch to rewrite the history of the repository, fixing the committer and author information. The trouble is... I...
What would be the best approach for versioning my whole database ? Creating a file for each database object (table,view,procedsure..) or rather having one file for all DDL scripts and any new change will be put in a separate file ? What about handling changes made in a Database manager tool ? I'd like to have a generic solutions for ...
I want to know what changes I made, without looking at the 30 other files that other team members modified. So when I hg out, it said the first changeset to push was 4821, so since then I have pulled, merged, and pushed a couple times. Now I want to make sure all the debugging code is removed. Is there a way to diff the current revisi...
Seems like in SVN, when you do a merge, there won't be a revision checked in by you. All your "commits" should only have code that is changed by you. But in Mercurial, that's not the case. Your "merge" commits are committed by you, but they usually contain changes that are made by other people. And if that commit triggered an error i...
A Mercurial Server can be started up just by hg serve and going to localhost:8000 but the diff is a text type of diff. I wonder if there is any way to get a visual diff right from the server (probably by clicking on a file or a changeset), the type of visual diff that is like on kdiff3 or Tortoise SVN diff. If it can be done, tha...
I discovered today that I can switch back to a branch even after I closed it. Why? hg init abc cd abc echo 'readme1' > README1.txt hg ci -Am "1st commit" hg branch other-branch echo 'readme2' > README2.txt hg ci -Am "2nd commit" hg update default hg merge other-branch hg ci -m "Merged other-branch into default" hg update other-branch ...
I may do development work for 2 weeks before one or two features get pushed to all the production servers, and since this is a Ruby on Rails project, many files can be modified. So using Mercurial as the source control, is there a good way to list all filenames that are modified (or added) by me, between the current version and revision...
My use case starts from something a lot like this; a team uses a central repository (in my case it is subversion, but I believe if it were git the issue would be the same), and some of the files are member-private (Django local settings files, IDE private project preferences etc). While the private file should remain private -- that is, ...
There can be: 1) just clone from remote repo as needed (each new one can take 20 minutes and 500MB) 2) clone 2 local ones from remote repo, both 500MB, total 1GB, so always have 2 local repo to work with 3) clone 1 local one from remote repo, called it 'master', and then don't touch this master, but clone other local ones from this m...
I understand well how Git can support file moves : as it uses file hash, a "added" file is easily detected as beeing same as the "removed" one. My question is about refactoring : considering Java, the package declaration changes so the file content will NOT be the same. In such case, how does Git determine that the "added" file shares h...
After thinking that I finally figured git out, I'm now finding myself super-confused about a git behavior I'm seeing -- whenever I push changes made and committed to my local machine up to my origin git repository, those changes immediately get staged to be undone on the origin server. Huh??!? I have a machine (machine A) with a git re...
One of the side-effects of using an external Subversion repository was getting automatic offsite backups on every commit. I'd like to achieve the same using Git. i.e. every commit to my local repository automatically commits to an external one so the two repositories are always in sync. I imagine that a post-commit hook would be the ...
Say if we have a project known as main, and then we have a project that is analytics, and in Bash, we are at the analytics working directory and accidentally push to the main remote repository, will all the files in analytics be added to the main project, and is it reversible? ...
What happens if there is already a Mercurial repository at /User/peter/development and now I want to add a repository for /User/peter because I also want to version .bashrc, .profile, or maybe /User/peter/notes as well. Will having a repository above an already existing repository create conflicts for Mercurial? ...
Hi, I'm looking for an open source forge that we can host in our lab for some private projetcs. Our favorite DVCS is bzr so this forge must support bzr repositories. While Launchpad is open source, this forge does not seem to be admin-friendly for hosting a private clone (no support, no migration script for database schema modificatio...
I have a git repository, which has changes that I am slowly bringing into a mercurial repository. (It's a weird history, and I'm hand checking everything, and just as well that I am). Currently, I've generating a diff using git diff, and merging it using patch. That had a few problems, so I switched hg import, which has problems of its ...
I've just started using Git and find that whilst I am implementing a feature in a branch, I will encounter some bug that really needs to be pushed to the trunk as soon as possible. In order to do so, I use checkout to switch back to the trunk, make my changes and commit them. I now have a trunk that is bug free. Unfortunately, my branch...
When working on multiple (open source) projects, multiple version controll systems start to be problematic. While they share common operations, I often make mistakes by typing hg add instead git add. I remember seeing project some time ago that made access to different source control software in uniform way by providing basic commands c...
Seems like for both Mercurial or Git, if I don't commit first, then I can't push? So if I don't commit (when not ready yet), I can't push to a remote server to back up my code? The code is in a notebook computer, being carried around, which can be somewhat fragile being carried around. ...
I'm trying to propose switching from CVS and SVN to Mercurial at work. Before I do, I'd like to have any foreseeable questions answered. How can I set up a repository to allow push and authenticate users? I'm more familiar with administering SVN, and in SVN it was just a few lines like: [users] userA = passwordA userB = passwordB A...