##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: clarify comment about merge ancestor when rebasing merges...
rebase: clarify comment about merge ancestor when rebasing merges The code for picking a merge ancestor when rebasing merges had a long and incorrect comment. The comment would perhaps have been fine as commit message but does not make the code more readable or maintainable and is a bad substitute for correct and readable code. The correct essense of the comment is quite trivial: a merge of an ancestor of the rebase destination and an 'outside' revision can be rebased as if it was a linear change, using 'destination ancestor parent' as base and pretty much ignoring the 'outside' revision. The code path where the comment is placed is however also used for other kinds of merge rebases. The comment is thus not really correct and not helpful. I think it would be better to drop the comment and rewrite the code.
Kevin Bullock - - Load All Authors

File last commit:

r20227:9c963a43 default
r23732:c51d6c04 default
Show More
hgrc.5.txt
41 lines | 788 B | text/plain | TextLexer
/ mercurial / help / hgrc.5.txt
History | Source | Raw |Copy content |Copy permalink
Takumi IINO
doc: make man and html from translated documents...
 r19426 ======
hgrc
======
---------------------------------
configuration files for Mercurial
---------------------------------
:Author: Bryan O'Sullivan <bos@serpentine.com>
:Organization: Mercurial
:Manual section: 5
:Manual group: Mercurial Manual
.. contents::
:backlinks: top
:class: htmlonly
Description
===========
.. include:: hgrc.5.gendoc.txt
Author
======
Bryan O'Sullivan <bos@serpentine.com>.
Mercurial was written by Matt Mackall <mpm@selenic.com>.
See Also
========
|hg(1)|_, |hgignore(5)|_
Copying
=======
This manual page is copyright 2005 Bryan O'Sullivan.
Kevin Bullock
doc: bump copyright year
 r20227 Mercurial is copyright 2005-2014 Matt Mackall.
Takumi IINO
doc: make man and html from translated documents...
 r19426 Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
.. include:: common.txt