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

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:

r814:0902ffec default


                r990:5007e0bd

default

Download file

             test-flags
        
                    34 lines
            
             | 360 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-flags

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	r800	#!/bin/sh -e
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412
Thomas Arendsen Hein Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags....	r491	umask 027
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412	mkdir test1
		cd test1

		hg init
		touch a b
		hg add a b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg ci -m "added a b" -d "0 0"
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412
		cd ..
		mkdir test2
		cd test2

		hg init
mpm@selenic.com Fix up tests for command name changes...	r440	hg pull ../test1
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412	hg co
		chmod +x a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg ci -m "chmod +x a" -d "0 0"
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412
		cd ../test1
		echo 123 >>a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg ci -m "a updated" -d "0 0"
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412
mpm@selenic.com Fix up tests for command name changes...	r440	hg pull ../test2
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412	hg heads
		hg history

mpm@selenic.com options: kill -d for debug...	r591	hg -v co -m
mpm@selenic.com [PATCH]: Typo in localrepository.update...	r412
		ls -l ../test[12]/a > foo
		cut -b 0-10 < foo

	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