News for hackers. Stuff that matters.
Re:'Hot migrating' from SVN to mercurial, and why we choosed... by awt on Sunday May 15, 2011 @01:36PM (#2550333)
With mercurial I think is better to abandon the idea of rewriting history to make it look nicer or more linear. The good point is that your history reflects precisely what happened and how developers merged the code

Rewriting history doesn't just make the git log look nicer. It gives you the ability to more easily create atomic commits, and it ensures that commits in a branch that is later merged back to master are contiguous instead of sprinkled among all of the other commits from all other branches. If you are tracking down a bug, this helps a lot, especially if you use git bisect.

Re:'Hot migrating' from SVN to mercurial, and why we choosed... by pnathan on Sunday May 15, 2011 @01:42PM (#2550348)
There are two different philosophies of branches as near as I can make out.

* Branches as 'records of effort'/'who did what when on what project'.

* Separating lines of development to keep mainline builds from falling over.

In a 'audit-thy-process' environment, immutable history and records of projects have a high importance. If the goal is 'simply' to separate lines of development - well then you can squash commits and it doesn't matter.

Re:'Hot migrating' from SVN to mercurial, and why we choosed... by rlpb on Sunday May 15, 2011 @02:39PM (#2550462)
Additionally, in open source development, you don't submit your mess. You submit clean patchsets ready for review. I don't see why a private development tree should be any different.
Re:'Hot migrating' from SVN to mercurial, and why we choosed... by johnm on Sunday May 15, 2011 @03:00PM (#2550513)
There are multiple approaches to "rewriting history" in a dvcs depending on what your workflow and preferences are.

In Hg you can do various forms of rebasing and rewriting history, e.g.: * http://mercurial.selenic.com/wiki/ConcatenatingChangesets * http://mercurial.selenic.com/wiki/EditingHistory * http://mercurial.selenic.com/wiki/RebaseExtension

The difference between Hg and Git in this regard is much more a question of what's the basis of their philosophy. Git promotes rewriting & rebasing while Hg is biased towards a more conservative approach.