I'm doing some offline development on my SVN working copy. Since I won't have access to the SVN repository for a while, I wanted to use Bazaar as a helper version control to keep the intermediate commit history before I commit everything back to the SVN repository. Is this possible? When I try to create a branch using TortoiseBZR from t...
Using a Macbook, I am worried that if the hard drive is on the road and it goes bad, then 3 days of code can all be lost. So I actually have a tmp repository on our main server computer, and I can hg push to it. The dilemma is, I can't push unless I commit first, and from previous experience, we shouldn't commit unless we are ready to ...
hg backout tip seem to also revert all your files back to the older version. Is there a way to change it back to EXACTLY like before the commit -- that is, with several files "Modified" but uncommitted -- essentially, as if the "commit" was never done? (hg rollback is said to be very bad and usually shouldn't be done for version contro...
I'm currently involved in a large project - the redevelopment of a corporate website. The project involves many staff across several teams (content, design, etc). There is a small team (myself and another developer) in charge of the front-end/presentation layer of the system - that is - the development of templates using HTML, CSS and ...
Is it possible, without pop whole stash and save another without this particular file? ...
I've been using TortoiseHG for some time now and I've been running into the same issue once in a while. Sometimes, when I commit my work, it gives me an error, saying that one (or more) of my files is being used by another process. However, the commit still goes through and is visible in the repository browser. Next, after closing the ...
Yesterday I committed a file and then wanted to hg backout, but Mercurial says cannot backout because I have other modified files in the project… That's a little bit strange… it is not atomic level on each file? Commit 1 file and then backout 1 file? Second, I can save a copy of those modified files A, B, C, to tmp files, hg revert th...
I have a repository that I created early in the learning curve of a project. As I've learned more, I've realized that this is creating problems because some of the files I want tracked aren't required in the compiled source. What I'd like to do is create a new "project" parent directory, move the existing source directory into that paren...
Hello, I'm working on a website with some other people. Usually when we want to modify something, we do the change on our machine and just upload the new version with ftp, hope it'll works (or that nobody will notice it doesn't the time we correct it) and that's it. It's already not the best way to work alone but even less to work coll...
I heard that if we are working on a feature and then we need to fix something quickly, we can make a temporary clone and then fix the bug, and push to the central repo. First of all, is the temporary repo cloned from the central repo or from our local repo? Also, is it good to clone 2, or 3 repos from the central repo to our hard drive...
Using Mercurial, say if I do an hg pull and hg up and now the local repo and working directory are both up to date. What if I commit often, say 1 day later, and then 2 days later, and want to diff with the revision as of right now? Otherwise, the diff is always comparing to the previous committed version. I can use pencil and paper an...
I wanna have this structure: project/ # The overall repository, *and* the project's mainline branch + joe/ # Developer Joe's primary branch of development | +- feature1/ # Developer Joe's feature1 development branch | | +- broken/ # A staging branch for Joe to develop feature1 | +- feature2/ #...
At work, we use Perforce for version control. There are problems with this: 1) with this centralized model, we can't check in changes until they are ready for regression. This means that we have no revision control during the development process. 2) We don't back up our client view of the depot, so our work is unsafe until we can chec...
We started using Mercurial a several weeks ago. Most developers follow this workflow: work on a feature commit -m "Worked on feature ABC" pull -u If branch merge commit -m "Merge" push Today, one of our developer suggested that we do: work on a feature pull -u if branch merge commit -m "Worked on feature ABC" push That way, w...
Is there any Mercurial extension that can grep for "console.log" that might have been accidentally left over as debugging code? Right now this is what I am doing: 1) hg out ssh://.... the above is to see what is the first committed revision in my local repo, say, the smallest revision is 3456 2) hg diff -r 3455 | grep "^+" | grep ...
Is there an easy way to find the SHA1 of the first commit in a project with a long history with git? ...
Do you (and your team) back up your local checkouts of your DVCS (Git, Mercurial) repository between pushes? How do you do so? If your hard drive were to fail after writing a bunch of code that was not yet stable (therefore not yet pushed), how would you get it back? ...
I have a repo where I'm seeing behavior that I don't understand. Ill refer to the repo that this is occuring on as the 'bad repo', all of the following sequences were run on that one. It doesn't matter what commit I reset to, same conflicting behavior. The files it reports as conflicting seem to be the ones that were changed in the co...
Hi, I'm looking for a DVCS which would allow me to use something like a "named commit" -- similar to what patch queues achieve, but not quite... (I'll compare only to mq and stg, since I don't know of any other similar ones) Patch queues are close, but I'd like those features: Creating new branch in the repository, branches also the p...
Is there a way to configure Mercurial to allow for empty commit messages? If you try hg commit through the CLI without entering a commit message, the commit is canceled with: abort: empty commit message. Now, I know that committing without a message is usually considered bad form, but does Mercurial allow it at all? ...