upstream/mercurial-mirror Files · tests/test-up-local-change.out

merge: remove redundant if

Matt Mackall - - Load All Authors

File last commit:

r2973:a3155719 default


                r2976:c67920d7

default

Download file

             test-up-local-change.out
        
                    141 lines
            
             | 3.4 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-up-local-change.out

History | Source | Raw |Copy content |Copy permalink

Bryan O'Sullivan Update tests to match new addremove chattiness.	r767	adding a
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	diff -r 33aaa84a386b a
mpm@selenic.com Add a simple testing framework...	r331	--- a/a
		+++ b/a
mason@suse.com Add new bdiff based unidiff generation.	r1637	@@ -1,1 +1,1 @@ a
mpm@selenic.com Add a simple testing framework...	r331	-a
		+abc
Bryan O'Sullivan Update tests to match new addremove chattiness.	r767	adding b
mpm@selenic.com Update test output for status change...	r748	M a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 0:33aaa84a386b
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	summary: 1

mpm@selenic.com Add a simple testing framework...	r331	resolving manifests
Matt Mackall Merge with crew, fix most tests	r2830	overwrite False branchmerge False partial False linear True
mpm@selenic.com update tests to reflect new short hash length...	r374	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
mpm@selenic.com Add a simple testing framework...	r331	a versions differ, resolve
		remote created b
		getting b
		merging a
		resolving a
Matt Mackall Repair ancestor logic, fix up test cases	r1351	file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
Benoit Boissinot ui: output the number of file updated/merged/removed/... on update...	r1922	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:802f095af299
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	tag: tip
		user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	summary: 2

mpm@selenic.com Add a simple testing framework...	r331	resolving manifests
Matt Mackall Merge with crew, fix most tests	r2830	overwrite False branchmerge False partial False linear True
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
		remote deleted b
		removing b
Benoit Boissinot ui: output the number of file updated/merged/removed/... on update...	r1922	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 0:33aaa84a386b
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	summary: 1

Vadim Gelfer merge with other head by default, not tip....	r2915	abort: there is nothing to merge - use "hg update" instead
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	failed
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 0:33aaa84a386b
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	summary: 1

		resolving manifests
Matt Mackall Merge with crew, fix most tests	r2830	overwrite False branchmerge False partial False linear True
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
		a versions differ, resolve
		remote created b
		getting b
		merging a
		resolving a
		file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
Benoit Boissinot ui: output the number of file updated/merged/removed/... on update...	r1922	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:802f095af299
Thomas Arendsen Hein Fixed tests for displaying tags in hg history and hg parents....	r388	tag: tip
mpm@selenic.com Add a simple testing framework...	r331	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Add a simple testing framework...	r331	summary: 2

Matt Mackall Only show long hashes with --debug, not --verbose	r2966	changeset: 1:802f095af299
Thomas Arendsen Hein Fixed tests for displaying tags in hg history and hg parents....	r388	tag: tip
mpm@selenic.com Add a simple testing framework...	r331	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Thomas Arendsen Hein Fixed test for previous change of 'hg -v history'....	r494	files: a b
mpm@selenic.com Add a simple testing framework...	r331	description:
		2

Thomas Arendsen Hein Add an empty line after description in verbose mode of show_changeset....	r546
Matt Mackall Only show long hashes with --debug, not --verbose	r2966	changeset: 0:33aaa84a386b
mpm@selenic.com Add a simple testing framework...	r331	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Thomas Arendsen Hein Fixed test for previous change of 'hg -v history'....	r494	files: a
mpm@selenic.com Add a simple testing framework...	r331	description:
		1

Thomas Arendsen Hein Add an empty line after description in verbose mode of show_changeset....	r546
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	diff -r 802f095af299 a
mpm@selenic.com Fix local file changes being ignored after non-branch merge...	r768	--- a/a
		+++ b/a
mason@suse.com Add new bdiff based unidiff generation.	r1637	@@ -1,1 +1,1 @@ a2
mpm@selenic.com Fix local file changes being ignored after non-branch merge...	r768	-a2
		+abc
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	adding b
		M a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:802f095af299
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	summary: 2

Matt Mackall Merge with crew, fix most tests	r2830	abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	failed
mcmillen@cs.cmu.edu Spelling fix: "commited" -> "committed"	r1995	abort: outstanding uncommitted changes
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	failed
		resolving manifests
Matt Mackall Merge with crew, fix most tests	r2830	overwrite False branchmerge True partial False linear False
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
		a versions differ, resolve
		b versions differ, resolve
		merging a
		resolving a
		file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2
		merging b
		resolving b
		file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
Benoit Boissinot ui: output the number of file updated/merged/removed/... on update...	r1922	0 files updated, 2 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:802f095af299
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	summary: 2

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 2:030602aee63d
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	tag: tip
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	parent: 0:33aaa84a386b
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	summary: 3

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	diff -r 802f095af299 a
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	--- a/a
		+++ b/a
		@@ -1,1 +1,1 @@ a2
		-a2
		+abc
Benoit Boissinot fix update when a locally added file match the target revision...	r2065	adding a
		pulling from ../a
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
Matt Mackall merge: simplify working dir manifest generation	r2973	merging a
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved

	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