upstream/mercurial-mirror Files · \ · RhodeCode Free Hosting

rebase: return early when source is descendant of destination...

rebase: return early when source is descendant of destination This only happens when using --base (or no source selection options), as rebase already aborts in this situation when using --source. Without this change you get an abort from the underlying merge, and the repository is in a different state than you started with (the working dir parent is changed).

Sune Foldager -


            r9578:341182ac

default

Name	Size	Modified	Last Commit	Author

contrib
doc
help
hgext
i18n
mercurial
templates
tests
.hgignore	Loading ...
.hgsigs	Loading ...
.hgtags	Loading ...
CONTRIBUTORS	Loading ...
COPYING	Loading ...
Makefile	Loading ...
README	Loading ...
hg	Loading ...
hgeditor	Loading ...
hgweb.cgi	Loading ...
hgwebdir.cgi	Loading ...
setup.py	Loading ...

README

Basic install:

$ make # see install targets
$ make install # do a system-wide install
$ hg debuginstall # sanity-check setup
$ hg # see help

See http://mercurial.selenic.com/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages