upstream/mercurial-mirror Files · tests/test-excessive-merge

convert/bzr: make it work with filemaps (issue1631)...

convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.

Benoit Boissinot - - Load All Authors

File last commit:

r3853:c0b44915 default


                r8165:78658990

default

Download file

             test-excessive-merge
        
                    46 lines
            
             | 566 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-excessive-merge

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Refactor excessive merge detection, add test	r1716	#!/bin/sh

		hg init

		echo foo > a
		echo foo > b
		hg add a b

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "test" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		echo blah > a

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "branch a" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		hg co 0

		echo blah > b

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "branch b" -d "1000000 0"
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	HGMERGE=true hg merge 1
Matt Mackall Refactor excessive merge detection, add test	r1716
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "merge b/a -> blah" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		hg co 1
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	HGMERGE=true hg merge 2
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "merge a/b -> blah" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		hg log
Benoit Boissinot switch to the .hg/store layout, fix the tests	r3853	hg debugindex .hg/store/00changelog.i
Matt Mackall Refactor excessive merge detection, add test	r1716
		echo

		echo 1
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 1
Matt Mackall Refactor excessive merge detection, add test	r1716	echo 2
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 2
Matt Mackall Refactor excessive merge detection, add test	r1716	echo 3
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 3
Matt Mackall Refactor excessive merge detection, add test	r1716	echo 4
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 4
Matt Mackall Refactor excessive merge detection, add test	r1716
		echo

Benoit Boissinot switch to the .hg/store layout, fix the tests	r3853	hg debugindex .hg/store/data/a.i
Matt Mackall Refactor excessive merge detection, add test	r1716
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	hg verify

	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