This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D4461 py3: use print as a function in tests/test-hgweb.t
Closed	pulkit	D4460 py3: bytestr a bytes val to make sure we get bytechr while iterating
Closed	pulkit	D4459 py3: make regexes in hgext/keyword.py bytes
Closed	pulkit	D4458 py3: add more missing b'' prefixes in test files
Closed	pulkit	D4457 py3: write the file in str mode in tests/test-rename-merge2.t
Closed	pulkit	D4456 py3: add missing b'' prefixes in tests/badserverext.py
Closed	pulkit	D4455 py3: handle keyword arguments correctly in hgext/acl.py
Closed	pulkit	D4454 py3: don't return the revid as unicode in hgext/convert/subversion.py
Closed	pulkit	D4453 py3: make sure we pass str in os.sysconf in hgext/convert/common.py

Diff 10747


	$ mkdir -p t			$ mkdir -p t
	$ cd t			$ cd t
	$ cat <<EOF > merge			$ cat <<EOF > merge
	> import sys, os			> import sys, os
	> f = open(sys.argv[1], "wb")			> f = open(sys.argv[1], "w")
	> f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3]))			> f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3]))
	> f.close()			> f.close()
	> EOF			> EOF

	perform a test merge with possible renaming			perform a test merge with possible renaming
	args:			args:
	$1 = action in local branch			$1 = action in local branch
	$2 = action in remote branch			$2 = action in remote branch