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

subrepo: change default path in hgrc of subrepo after cloning...

subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

Stuart W Marks - - Load All Authors

File last commit:

r9717:68a1b9d0 default


                r10378:e1401c74

default

Download file

             test-up-local-change.out
        
                    159 lines
            
             | 4.0 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
Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
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
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
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

Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	searching for copies back to rev 1
		unmatched files in other:
		b
mpm@selenic.com Add a simple testing framework...	r331	resolving manifests
Matt Mackall merge: various tidying...	r3314	overwrite False partial False
		ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
Matt Mackall merge: simplify actions with helper function	r3121	a: versions differ -> m
		b: remote created -> g
Matt Mackall merge: introduce mergestate	r6512	preserving a for resolve of a
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'true' for a (binary False symlink False)
mpm@selenic.com Add a simple testing framework...	r331	merging a
Matt Mackall merge: various tidying...	r3314	my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
Matt Mackall merge: combine merge and get lists	r2977	getting b
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: various tidying...	r3314	overwrite False partial False
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b
Matt Mackall merge: allow merging going backwards...	r8742	a: versions differ -> m
Matt Mackall merge: pretend ancestor is local to simplify backwards and overwrite	r8734	b: other deleted -> r
Matt Mackall merge: allow merging going backwards...	r8742	preserving a for resolve of a
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	removing b
Matt Mackall merge: allow merging going backwards...	r8742	picked tool 'true' for a (binary False symlink False)
		merging a
		my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b
		premerge successful
		0 files updated, 1 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

Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	searching for copies back to rev 1
		unmatched files in other:
		b
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	resolving manifests
Matt Mackall merge: various tidying...	r3314	overwrite False partial False
		ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
Matt Mackall merge: simplify actions with helper function	r3121	a: versions differ -> m
		b: remote created -> g
Matt Mackall merge: introduce mergestate	r6512	preserving a for resolve of a
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'true' for a (binary False symlink False)
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	merging a
Matt Mackall merge: various tidying...	r3314	my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
Matt Mackall merge: combine merge and get lists	r2977	getting b
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
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
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
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	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

Stuart W Marks update: allow branch crossing without -c or -C, with no uncommitted changes...	r9717	abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	failed
Steve Borho merge: give hint as to how to discover uncommitted changes...	r8545	abort: outstanding uncommitted changes (use 'hg status' to list changes)
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	failed
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	searching for copies back to rev 1
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	resolving manifests
Matt Mackall merge: various tidying...	r3314	overwrite False partial False
		ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
Matt Mackall merge: simplify actions with helper function	r3121	a: versions differ -> m
		b: versions differ -> m
Matt Mackall merge: introduce mergestate	r6512	preserving a for resolve of a
		preserving b for resolve of b
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'true' for a (binary False symlink False)
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	merging a
Matt Mackall merge: various tidying...	r3314	my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'true' for b (binary False symlink False)
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	merging b
Matt Mackall merge: various tidying...	r3314	my b@802f095af299+ other b@030602aee63d ancestor b@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
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Benoit Boissinot abort when using 'update -m' and this is not a merge...	r1674	-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: if filemerge skips merge, report as updated	r3400	1 files updated, 0 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