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

Issue a warning if "-r ." is used with two working directory parents....

Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.

Thomas Arendsen Hein -


            r4510:e0bc2c57

default

Name	Size	Modified	Last Commit	Author

contrib
doc
hgext
mercurial
templates
tests
.hgignore	Loading ...
.hgsigs	Loading ...
.hgtags	Loading ...
CONTRIBUTORS	Loading ...
COPYING	Loading ...
Makefile	Loading ...
README	Loading ...
hg	Loading ...
hgeditor	Loading ...
hgmerge	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://www.selenic.com/mercurial/ 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