upstream/mercurial-mirror Files · tests/test-merge1.out

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.

Matt Mackall - - Load All Authors

File last commit:

r3618:3109f012 default


                r5378:8a2915f5

default

Download file

             test-merge1.out
        
                    55 lines
            
             | 1.5 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge1.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% no merges expected
Matt Mackall merge: if filemerge skips merge, report as updated	r3400	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	(branch merge, don't forget to commit)
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	diff -r d9e5953b9dec b
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+This is file b1
		M b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge should fail
Matt Mackall Clarify untracked file merge message	r3618	abort: untracked local file 'b' differs from remote version
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge of b expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	diff -r d9e5953b9dec b
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+This is file b2
		M b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%%
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	Contents of b should be "this is file b1"
mpm@selenic.com Fix up test-merge1...	r430	This is file b1
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge fails
mcmillen@cs.cmu.edu Spelling fix: "commited" -> "committed"	r1995	abort: outstanding uncommitted changes
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge expected!
Matt Mackall merge: if filemerge skips merge, report as updated	r3400	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	(branch merge, don't forget to commit)
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	diff -r c1dd73cbf59f b
		--- a/b
		+++ b/b
		@@ -1,1 +1,1 @@ This is file b1
		-This is file b1
		+This is file b22
		M b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge of b should fail
mcmillen@cs.cmu.edu Spelling fix: "commited" -> "committed"	r1995	abort: outstanding uncommitted changes
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge of b expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	diff -r c1dd73cbf59f b
		--- a/b
		+++ b/b
		@@ -1,1 +1,1 @@ This is file b1
		-This is file b1
		+This is file b33
		M b

	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