upstream/mercurial-mirror Files · tests/test-help

Fix long-standing excessive file merges...

Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.

mpm@selenic.com - - Load All Authors

File last commit:

r896:01215ad0 default


                r990:5007e0bd

default

Download file

             test-help
        
                    15 lines
            
             | 143 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-help

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Remove bashisms and use /bin/sh instead of /bin/bash....	r544	#!/bin/sh
mpm@selenic.com Add a simple testing framework...	r331
Thomas Arendsen Hein Further help improvements:...	r849	hg
		hg -q
mpm@selenic.com A bunch of parsing/help updates...	r596	hg help
Thomas Arendsen Hein Support for 'hg --version'. setup.py stores version from hg repository....	r423	hg -q help
mpm@selenic.com Add a simple testing framework...	r331	hg add -h
mpm@selenic.com A bunch of parsing/help updates...	r596	hg add --skjdfks
mpm@selenic.com Add a simple testing framework...	r331	hg help diff
Thomas Arendsen Hein Further help improvements:...	r849	hg help status
		hg -q help status
mpm@selenic.com Add a simple testing framework...	r331	hg help foo
Thomas Arendsen Hein Further help improvements:...	r849	hg skjdfks
mpm@selenic.com Add a simple testing framework...	r331
Thomas Arendsen Hein Support for 'hg --version'. setup.py stores version from hg repository....	r423	exit 0

	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