This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	Alphare	D11004 test-run-tests: add missing backslash for Windows
Closed	Alphare	D11003 windows: use cpu-intensive task instead of real time in test
Closed	Alphare	D11002 windows: use shell function instead of variable substitution
Closed	marmoute	D11041 run-tests: use a global WINDOWS constant instead of multiple tests
Closed	marmoute	D11034 test-run-test: use explicit variables to clarify paths
Closed	marmoute	D11087 sigpipe-remote: simply delegate pipe forwarding to subprocess we can kill
Closed	marmoute	D11086 sigpipe-remote: verify the script is IO are unbuffered
Closed	marmoute	D11085 sigpipe-remote: check environment variable sooner
Closed	marmoute	D11084 test-sigpipe: run the hook using `sh`
Closed	marmoute	D11083 dummyssh: call python script with python
Closed	marmoute	D11082 dummyssh: use subprocess instead of os.call
Closed	marmoute	D11081 run-test: rework the redirection script for python on windows
Closed	marmoute	D11080 run-test: act that we requires MSYS to run the test on Windows
Closed	marmoute	D11079 sigpipe-remote: display more information about the non-py3 python
Closed	marmoute	D11078 sigpipe-remote: check for python version earlier in the script
Closed	marmoute	D11045 run-tests: cleanup windows generation of the python / python3 pointeur
Closed	marmoute	D11044 run-tests: always define a custom-bin directory
Closed	marmoute	D11043 run-tests: explicitly track that `pythondir` was inferred
Closed	marmoute	D11048 test-infinitepush: drop unused helper
Closed	marmoute	D11047 run-tests: setup "correct" python earlier
Closed	Alphare	D11025 ci-windows: introduce manual windows CI
Closed	marmoute	D11073 windows: make sure we fully read and cleany close the connection
Abandoned	marmoute	D11057 compat: enforce upper case drive letter in mercurial too
Closed	marmoute	D11056 test-bookmark: clarify the path involved in a pull creating divergence
Closed	marmoute	D11055 test-removeemptydirs: adjust to Windows behavior for the `histedit` case
Closed	marmoute	D11054 test-removeemptydirs: clarify the state of things in the `histedit` case
Closed	marmoute	D11053 run-tests: rely on an actual executable in PATH instead of alias for `hg`
Closed	marmoute	D11052 tests: blacklist a handful of test with `rhg` or `chg`
Closed	marmoute	D11051 run-tests: use more explicit signaling for `chg`
Closed	marmoute	D11050 run-tests: drop the `rhg` flag for `hghave.py` if unset
Closed	marmoute	D11049 run-tests: introduce a `HGTEST_REAL_HG` variable for test
Closed	marmoute	D11046 run-test: clarify the error with a bad --with-hg is passed
Closed	marmoute	D11072 check-code: add a rules to catch os.path.abspath
Closed	marmoute	D11071 windows: use abspath in convert.subversion
Closed	marmoute	D11070 windows: use abspath in convert.git
Closed	marmoute	D11069 windows: use abspath in convert.bzr
Closed	marmoute	D11068 windows: use abspath in the git extension
Closed	marmoute	D11067 windows: use abspath in url
Closed	marmoute	D11066 windows: use abspath in subrepoutil
Closed	marmoute	D11065 windows: use abspath in subrepo
Closed	marmoute	D11064 windows: use abspath in hgwebdir
Closed	marmoute	D11063 windows: use abspath in mercurial/hg.py
Closed	marmoute	D11062 windows: use abspath in extensions
Closed	marmoute	D11061 windows: use abspath in commandserver
Closed	marmoute	D11060 windows: use abspath in chgserver
Closed	marmoute	D11059 windows: introduce a `util.abspath` to replace os.path.abspath
Closed	marmoute	D11058 windows: enforce upper case drive letter for getcwd in mercurial too
Closed	marmoute	D11042 hg-ssh: normalize the drive of the current working directory on windows
Closed	marmoute	D11035 run-tests: enforce the drive letter from `getcwd` to upper case
Closed	Alphare	D11000 windows: add windows behavior on broken pager
Closed	Alphare	D11001 run-tests: also catch double-escapes for $TESTTMP

Diff 29196

tests/test-bookmarks.t

	neither the working directory nor current active bookmark: "no-op"			neither the working directory nor current active bookmark: "no-op"
	case)			case)

	$ echo yy >> y			$ echo yy >> y
	$ hg commit -m yy			$ hg commit -m yy

	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '			$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
	* Y 3:125c9a1d6df6			* Y 3:125c9a1d6df6
				$ hg -R ../cloned-bookmarks-update path
				default = $TESTTMP/repo
				$ pwd
				$TESTTMP/repo
	$ hg -R ../cloned-bookmarks-update pull . --update			$ hg -R ../cloned-bookmarks-update pull . --update
	pulling from .			pulling from .
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	divergent bookmark Z stored as Z@default			divergent bookmark Z stored as Z@default
	adding remote bookmark foo			adding remote bookmark foo

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29070		Jul 9 2021, 9:00 PM	★	★
Diff 2	29196	rHG28a914b3d4ceabb0434ecac03bc7487d2a50bcb8	Jul 9 2021, 8:42 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

test-bookmark: clarify the path involved in a pull creating divergenceClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 29196

tests/test-bookmarks.t

test-bookmark: clarify the path involved in a pull creating divergence
ClosedPublic

Revision Contents
Changeset List