Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Hg post-merge commit message, best practice?

Tags:

mercurial

I find myself doing the following a lot:

C:\Code>hg pull
pulling from http://server/FogBugz/kiln/Repo/Project/Rebuild/trunk
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 4 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)

C:\Code>hg merge
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, dont forget to commit)

C:\Code>hg commit -m "Merged"

C:\Code>hg push
pushing to http://server/FogBugz/kiln/Repo/Project/Rebuild/trunk
searching for changes
remote: kiln: successfully pushed 2 changesets

My question is, what is a better/more useful commit message to use after merging a pull from the repository. Are there any best practices that people use in distributed version control systems for this sort of thing?

like image 615
automagic Avatar asked Oct 20 '10 20:10

automagic


People also ask

Should commit messages be short?

General Commit Message Guidelines As a general rule, your messages should start with a single line that's no more than about 50 characters and that describes the changeset concisely, followed by a blank line, followed by a more detailed explanation.


1 Answers

If you use the fetch extension it automates the pull,merge step into one step, fetch. The message it auto-generates is something along the lines of "automatic merge". The hg developers seem to think this is reasonable as the extension is now distributed with the base.

Merge messages don't seem to be contain a particularly high amount of information. Your message seems reasonable.

[[ offtopic, we sometimes use them as an opportunity for a pun on the word merge]]

like image 180
Paul Rubel Avatar answered Sep 30 '22 16:09

Paul Rubel