dvcs

This is a difficult situation to explain, so bear with me. I have a Mercurial repository with 2 main branches, default and dev . Work is usually done in a named branch off of dev (a feature branch). There may be many feature branches at any one time. Once work is completed in that branch, it is merged back into dev . When the time comes to prepare a release, another named branch is created off of dev (a release branch). Sometimes it is necessary to exclude entire features from a release. If that is the case, the merge changeset from where the feature branch was merged into dev is backed out of

I'm interested in trying out distributed version control systems. git sounds promising, but I saw a note somewhere for the Windows port of git that says "don't use non-ASCII filenames". I can't find that now, but there is this link . It's put me off git for now, but I don't know if the other options are any better. Support for non-ASCII filenames is essential for my Japanese company. I'm looking for one that internally stores filenames as Unicode, not a platform-dependent encoding which would cause endless grief. So: What DVCS support Unicode filenames? In both Windows and Linux? Ideally, with

Is there a way to remove a from a remote changeset, or to remove an entire changeset? I accidentely pushed a .war file to a remote repo and I want to remove it. Martin Geisler Mercurial tries very hard to keep your data safe, so you can generally not change history. That being said, there are numerous extensions for Mercurial that allows you to quite easily change history anyway. There is a page on the wiki about editing history . That page also explains the consequences. In your specific case, you have to ask yourself if others will have already pulled your changeset? If so, then even if you

Is it possible to clone part of a Mercurial repository? Let's say the repository is quite large, or contains multiple projects, or multiple branches. Can I clone only part of the repository? E.g. in Subversion, you might have trunk and branches . If I only want to get trunk (or one of the branches) I can just request [project]/trunk . If I clone the hg repo I'll get trunk and all of the branches. This might be a lot of information I don't want. Can I avoid getting this? Alternatively, if I want to have multiple projects in one hg repo, how should I do this? I.e. so that I might just get one of

I could have sworn there was a way to keep a local ignore file in an hg repo, i.e. a file similar in function to .hgignore, but not checked into the repo. This could be used to ignore changes to an IDE project file if different IDEs are being used, for example. I'm having trouble finding how it's done. Does anyone recall the details? fakeleft This is what I was looking for. Add the following to the repo's .hg/hgrc: [ui] ignore = /path/to/repo/.hg/hgignore and create a new file .hg/hgignore beside it. This new file will be untracked, but work the same as the versioned .hgignore file for this

I wonder if it is possible to use nuget to only store references to the required packages in version control (only the package.config and ignore the packages folder). Is there a way to tell nuget to (re)download all the referenced packages in the various package.config files? Or something similar which could be put into a build script. Update: Seems that I'm not the only one who requested this feature: See this work item (thanks to PHeiberg for the hint) Update 2: NuGet now has this feature builtin. See Using NuGet without committing packages to source control for details. All left is to add

I am working with a bitbucket git repo I have read-only access to, so I created a fork to work on my features. Question: How do I update my fork to include changes made to the original repo made by the owner? On github, it seems one has to do the following, so I suspect it's a similar to this: $ git remote add upstream git://github.com/octocat/Spoon-Knife.git $ git fetch upstream $ git merge upstream/master I couldn't find any information on this in the Bitbucket Documentation for forking Martin Geisler Just like GitHub, you have to pull the commits down to your own machine, merge, and then

I was checking out for a rich GUI for Git on Linux . Of late I have started using it a lot and find that even though command-line is very useful, I would still want a GUI at my disposal since I am not still very much aware with the advanced features. I came across this question on SO before , but I still have to ask this question again, as that question doesn't have my answer I have used git-cola and gitk , but they look half-baked and gitk looks like I am working on some other DE. All the features I require in gitGUI is not in either or them. I tried giggle , but it is more useful for

There've been several questions recently about skipping changes when maintaining release branches in Mercurial. For example: Mercurial: Branch specific changes keep coming back after dummy merge Why are Mercurial backouts in one branch affecting other branches? Since it was introduced in 2.0, I've wondered about using graft to avoid this problem. Given a revision tree like this: A---B---C---D---E---F---G---H---I---J Suppose we need to create a release branch that skips the Evil change E . hg update -r D hg graft "F::J" giving us: A---B---C---D---E---F---G---H---I---J \ --F'--G'--H'--I'--J' Q1: