This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1991		Sep 22 2017, 5:27 AM	★	★
Diff 2	2209		Oct 1 2017, 5:32 AM	★	★
Diff 3	2544	rHG7df85ba726207ca90b312250ea4e6a965c8fae02	Oct 2 2017, 5:05 PM	★	★

Status	Author	Revision
Closed	mbthomas	D955 merge: improve comments in mergestate._makerecords
Closed	mbthomas	D861 commands: tidy up merge state decoding in resolve
Closed	mbthomas	D787 tests: add test for path conflicts during merge
Closed	mbthomas	D786 tests: add test for path conflicts during update
Closed	mbthomas	D785 context: also consider path conflicts when clearing unknown files
Closed	mbthomas	D784 merge: check for path conflicts when merging (issue5628)
Closed	mbthomas	D783 util: add safename function for generating safe names to rename to
Closed	mbthomas	D782 merge: improve error messages for path conflicts during update
Closed	mbthomas	D781 merge: check for path conflicts when updating (issue5628)
Closed	mbthomas	D780 merge: rename conflicts to fileconflicts in _checkunknownfiles
Closed	mbthomas	D779 merge: add _checkunknowndirs function for detecting path conflicts
Closed	mbthomas	D778 merge: backup conflicting directories when getting files
Closed	mbthomas	D777 merge: add merge action 'pr' to rename files during update
Closed	mbthomas	D776 merge: add merge action 'p' to record path conflicts during update
Closed	mbthomas	D775 commands: update the resolve command to handle path conflicts
Closed	mbthomas	D774 merge: add pathconflict merge state
Closed	mbthomas	D773 tests: add a test demonstrating basic path conflict failures
Closed	mbthomas	D680 scmutil: handle conflicting files and dirs in origbackuppath
Closed	mbthomas	D679 scmutil: don't append .orig to backups in origbackuppath

Diff 2544

				$ hg init repo
				$ cd repo
				$ echo base > base
				$ hg add base
				$ hg commit -m "base"
				$ hg bookmark -i base
				$ echo 1 > a
				$ hg add a
				$ hg commit -m "file"
				$ hg bookmark -i file
				$ echo 2 > a
				$ hg commit -m "file2"
				$ hg bookmark -i file2
				$ hg up -q 0
				$ mkdir a
				$ echo 2 > a/b
				$ hg add a/b
				$ hg commit -m "dir"
				created new head
				$ hg bookmark -i dir

				Basic merge - local file conflicts with remote directory

				$ hg up -q file
				$ hg bookmark -i
				$ hg merge --verbose dir
				resolving manifests
				getting a/b
				abort: *: '$TESTTMP/repo/a/b' (glob)
				[255]
				$ hg update --clean .
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Basic update - local directory conflicts with remote file

				$ hg up -q 0
				$ mkdir a
				$ echo 3 > a/b
				$ hg up file
				abort: *: '$TESTTMP/repo/a' (glob)
				[255]
				$ hg up --clean file
				abort: *: '$TESTTMP/repo/a' (glob)
				[255]

				Repo is in a very bad state now - recover manually

				$ rm -r a
				$ hg up -q --clean 0

				Basic update - untracked file conflicts with remote directory

				$ hg up -q 0
				$ echo untracked > a
				$ hg up --config merge.checkunknown=warn dir
				abort: *: '$TESTTMP/repo/a/b' (glob)
				[255]

				Repo is in a very bad state now - recover manually

				$ rm -f a
				$ hg up -q --clean 0

				Basic clean update - local directory conflicts with changed remote file

				$ hg up -q file
				$ rm a
				$ mkdir a
				$ echo 4 > a/b
				$ hg up file2
				abort: *: '$TESTTMP/repo/a' (glob)
				[255]
				$ hg up --clean file2
				abort: *: '$TESTTMP/repo/a' (glob)
				[255]

				Repo is in a very bad state now - recover manually

				$ rm -r a
				$ hg up -q --clean 0