Re:Mercurial: Onward and upward
by brianwawok on Thursday April 30, 2015 @09:52PM
(#9468913)
What if the same file has 2 separate commits you want to split up?
Re:Mercurial: Onward and upward
by zak_mc_kracken on Thursday April 30, 2015 @10:40PM
(#9469077)
Yes, this is a very underhyped feature.
They're called "hunks" in git parlance: sections of the file that define a "diff". A diff on a file can be made of multiple hunks.
Very often, my changes to a file are a mix of "fixing a serious bug" and "minor refactoring" and "removing dead code". When the time to commit comes, git makes it trivial to separate all these changes in different commits so that each commit does one thing and one thing only.
You can use "hg commit -i". This is a new feature in hg 3.4, but in older versions you can turn on the record extension.
I just noticed recently that TortoiseHG lets you do that in the GUI. Definitely is a nice feature. I only just started using Git and did like the ability to cherry pick from a file, but happy to know I can still do that with hg.
Re:Mercurial: Onward and upward
by imakesnowflakes on Friday May 01, 2015 @12:01AM
(#9469319)
Actually Hg record can do this. It lets you 'edit' a hunk using a text editor, before adding it to the list of changes to include in the current commit....
I use Git on a daily basis, but I never understood it.
If I just want to commit a specific part of my changes, I just do it. It's nice to see which files are staged for a commit, but I also see them in the commit msg comments.