Request for rebaseif extension to be provided by default with rebase
antoine.mechelynck at gmail.com
Sat Jun 18 06:27:57 CDT 2011
On 18/06/11 10:35, Sébastien Deleuze wrote:
> I don't think so, fast forward merge after a pull is more about changes
> already commited locally before the pull.
Well, hg update is about changing which changeset is reflected in the
When there are no uncommitted changes, "hg update" always succeeds
(IIUC) and it makes your current working directory reflect the contents
of the requested changeset. No new commit happens in any case, and no
merge is necessary, since with no uncommitted changes, what would there
be to merge? If the requested changeset is a descendant of the
previously current changeset, then IIUC you get the equivalent of what
git calls a fast-forward.
The way I see it, the only time a fast-forward would need to "merge"
anything would be if there were uncommitted changes.
Build a better mousetrap, the saying goes -- and with the brassiere,
Yankee Ingenuity did exactly that. But their true stroke of genius was
the new bait. The old fashioned mousetrap was loaded with cheese;
nobody cares much about cheese, except mice. But when American
Know-How reloaded the brassiere with tits, every heterosexual male in
the country was hopelessly trapped.
-- Alan Sherman, "The Rape of the A*P*E*"
More information about the Mercurial