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

Add a features list to branches.cache to detect caches of old hg versions....

Add a features list to branches.cache to detect caches of old hg versions. The leading space in the written file makes sure that the feature list never can match an existing version, even if the first feature can be read as hex. Additionally old hg versions display the id with --debug, too.

Matt Mackall - - Load All Authors

File last commit:

r3736:ad3d5b43 default


                r4168:bbfe5a3f

default

Download file

             test-merge6
        
                    46 lines
            
             | 724 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge6

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
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616
		cat <<'EOF' > merge
		#!/bin/sh
		echo merging for `basename $1`
		EOF
		chmod +x merge
Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	r800	HGMERGE=./merge; export HGMERGE
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616
		mkdir A1
		cd A1
		hg init
		echo This is file foo1 > foo
		echo This is file bar1 > bar
		hg add foo bar
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit text" -d "1000000 0"
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616
		cd ..
		hg clone A1 B1

		cd A1
		rm bar
		hg remove bar
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616
		cd ../B1
		echo This is file foo22 > foo
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616
		cd ..
		hg clone A1 A2
		hg clone B1 B2

		cd A1
		hg pull ../B1
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	hg merge
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	echo bar should remain deleted.
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616
		cd ../B2
		hg pull ../A2
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	hg merge
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	echo bar should remain deleted.
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug

	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