jesse.glick at oracle.com
Fri Sep 2 07:13:03 CDT 2011
On 09/02/2011 07:42 AM, Laurens Holst wrote:
> in SVN [...] if one of the files you’re committing has been changed it will tell you to update first
Right, which is why I suggested that any push continue only "so long as there were no 3-way file merges", i.e. even those without apparent conflict, since they deserve
some kind of manual review. For bonus points the command could:
- also cancel the push in case of potentially questionable corner cases in the merge, like local modified / remote moved
- first show a patch, or diffstat, of all outgoing changes and prompt for confirmation; requires http://mercurial.selenic.com/bts/issue219
- effectively pass '-b .' to both the fetch and push components (i.e. only deal with heads of the current branch)
- print a list of all merged files, if it halted for this reason, to make it easy to rerun tests on associated components
> hg pull -u && hg commit -m "..." && hg push is similar to what svn commit -m "..." does.
Note that this is unrelated to the command I was suggesting, which was assumed to follow one or more local commits and would most closely resemble 'hg fetch && hg push'
More information about the Mercurial-devel