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

convert: add a mode where mercurial_sink skips empty revisions....

convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.

Benoit Boissinot - - Load All Authors

File last commit:

r3592:fffc8a73 default


                r5378:8a2915f5

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