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

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.

Benoit Boissinot - - Load All Authors

File last commit:

r3592:fffc8a73 default


                r4168:bbfe5a3f

default

Download file

             test-merge5
        
                    20 lines
            
             | 439 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5

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
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415
		mkdir t
		cd t
		hg init
		echo This is file a1 > a
		echo This is file b1 > b
		hg add a b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit #0" -d "1000000 0"
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	echo This is file b22 > b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m"comment #1" -d "1000000 0"
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	hg update 0
		rm b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -A -m"comment #2" -d "1000000 0"
Thomas Arendsen Hein Don't require the "yes" command for test-merge5.	r1963	# in theory, we shouldn't need the "-y" below, but it prevents
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	# this test from hanging when "hg update" erroneously prompts the
		# user for "keep or delete"
Thomas Arendsen Hein Don't require the "yes" command for test-merge5.	r1963	hg update -y 1

mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	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