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

run-tests: give each child its own tmp dir (issue1911)...

run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.

Patrick Mezard - - Load All Authors

File last commit:

r9429:d8143769 default


                r9899:be574a37

stable

Download file

             test-merge1.out
        
                    64 lines
            
             | 1.7 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
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% no merges expected
Dirkjan Ochtman merge: add -S/--show option to review revisions without merging	r8387	changeset: 1:4ee19afe4659
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: commit #1

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
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge should fail
Thomas Arendsen Hein Fix misleading error and prompts during update/merge (issue556)	r5670	abort: untracked file in working directory differs from file in requested revision: 'b'
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
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
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
Steve Borho merge: give hint as to how to discover uncommitted changes...	r8545	abort: outstanding uncommitted changes (use 'hg status' to list 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
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	-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
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge of b should fail
Steve Borho merge: give hint as to how to discover uncommitted changes...	r8545	abort: outstanding uncommitted changes (use 'hg status' to list 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
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	-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