This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D5042 py3: add some glob to make output compatible with python 3
Closed	pulkit	D5041 py3: add a b'' prefix in tests/test-requires.t
Closed	pulkit	D5040 py3: use '%d' for rev nums instead of '%s'
Closed	pulkit	D5039 py3: add __pycache__ to .hgignore
Closed	pulkit	D5038 py3: more globing of things to make output compatible between py2 and py3
Closed	pulkit	D5037 py3: use stringutil.pprint() instead of '%r'
Closed	pulkit	D5036 py3: use '%d' for integers instead of '%s'
Closed	pulkit	D5035 py3: add some py3 specific output to test
Closed	pulkit	D5034 py3: use stringutil.pprint() in color.py instead of '%r'
Closed	pulkit	D5033 py3: add b'' prefixes in tests/test-progress.t
Closed	pulkit	D5032 py3: add b'' prefixes to tests/test-keyword.t
Closed	pulkit	D5031 py3: use stringutil.pprint() if we are printing bool values
Closed	pulkit	D5030 py3: glob some difference between py2 and py3 output
Closed	pulkit	D5029 py3: byteify tests/wireprotosimplecache.py
Closed	pulkit	D5028 py3: add b'' prefixes in tests/test-help.t
Closed	pulkit	D5027 py3: use sys.stdout.buffer for binary output in tests/svnxml.py
Closed	pulkit	D5026 py3: use '%s' instead of %r in hgext/convert/subversion.py
Closed	pulkit	D5025 py3: make test-contrib-perf.t work on python 3
Closed	pulkit	D5024 py3: add 3 more passing tests to whitelist caught by buildbot
Closed	pulkit	D5023 py3: add some r'' prefixes in hgext/narrow/narrowwirepeer.py

Diff 11976

	test-obsolete-bounds-checking.t			test-obsolete-bounds-checking.t
	test-obsolete-bundle-strip.t			test-obsolete-bundle-strip.t
	test-obsolete-changeset-exchange.t			test-obsolete-changeset-exchange.t
	test-obsolete-checkheads.t			test-obsolete-checkheads.t
	test-obsolete-distributed.t			test-obsolete-distributed.t
	test-obsolete-divergent.t			test-obsolete-divergent.t
	test-obsolete-tag-cache.t			test-obsolete-tag-cache.t
	test-obsolete.t			test-obsolete.t
				test-origbackup-conflict.t
	test-pager-legacy.t			test-pager-legacy.t
	test-pager.t			test-pager.t
	test-parents.t			test-parents.t
	test-parseindex2.py			test-parseindex2.py
	test-patch-offset.t			test-patch-offset.t
	test-patch.t			test-patch.t
	test-patchbomb-bookmark.t			test-patchbomb-bookmark.t
	test-patchbomb-tls.t			test-patchbomb-tls.t
	test-patchbomb.t			test-patchbomb.t
				test-pathconflicts-basic.t
	test-pathconflicts-merge.t			test-pathconflicts-merge.t
	test-pathconflicts-update.t			test-pathconflicts-update.t
	test-pathencode.py			test-pathencode.py
	test-pending.t			test-pending.t
	test-permissions.t			test-permissions.t
	test-phases-exchange.t			test-phases-exchange.t
	test-phases.t			test-phases.t
	test-progress.t			test-progress.t

	$ hg up -q 0			$ hg up -q 0
	$ mkdir b			$ mkdir b
	$ echo c5 > b/c			$ echo c5 > b/c
	$ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups			$ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups
	resolving manifests			resolving manifests
	b/c: replacing untracked file			b/c: replacing untracked file
	getting b/c			getting b/c
	creating directory: $TESTTMP/repo/.hg/badorigbackups/b			creating directory: $TESTTMP/repo/.hg/badorigbackups/b
	abort: $ENOTDIR$: '$TESTTMP/repo/.hg/badorigbackups/b'			abort: $ENOTDIR$: $TESTTMP/repo/.hg/badorigbackups/b (glob)
	[255]			[255]
	$ cat .hg/badorigbackups			$ cat .hg/badorigbackups
	data			data


	Basic clean update - local directory conflicts with changed remote file			Basic clean update - local directory conflicts with changed remote file

	$ hg up -q file			$ hg up -q file
	$ rm a			$ rm a
	$ mkdir a			$ mkdir a
	$ echo 4 > a/b			$ echo 4 > a/b
	$ hg up file2			$ hg up file2
	abort: *: '$TESTTMP/repo/a' (glob)			abort: : $TESTTMP/repo/a* (glob)
	[255]			[255]
	$ hg up --clean file2			$ hg up --clean file2
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(activating bookmark file2)			(activating bookmark file2)

	Repo state is ok			Repo state is ok

	$ hg sum			$ hg sum
	parent: 2:f64e09fac717			parent: 2:f64e09fac717
	file2			file2
	branch: default			branch: default
	bookmarks: *file2			bookmarks: *file2
	commit: (clean)			commit: (clean)
	update: 1 new changesets, 2 branch heads (merge)			update: 1 new changesets, 2 branch heads (merge)
	phases: 4 draft			phases: 4 draft