This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2004		Sep 22 2017, 5:28 AM	★	★
Diff 2	2222		Oct 1 2017, 5:33 AM	★	★
Diff 3	2363		Oct 2 2017, 5:15 PM	★	★
Diff 4	2557	rHGc7d5642811ac040f55230569398fd29604516d65	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 2557

tests/test-pathconflicts-update.t

This file was added.

				$ hg init repo
				$ cd repo
				$ echo base > base
				$ hg add base
				$ hg commit -m "base"
				$ hg bookmark -i base
				$ mkdir a
				$ echo 1 > a/b
				$ hg add a/b
				$ hg commit -m "file"
				$ hg bookmark -i file
				$ echo 2 > a/b
				$ hg commit -m "file2"
				$ hg bookmark -i file2
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkdir a
				$ ln -s c a/b
				$ hg add a/b
				$ hg commit -m "link"
				created new head
				$ hg bookmark -i link
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkdir -p a/b/c
				$ echo 2 > a/b/c/d
				$ hg add a/b/c/d
				$ hg commit -m "dir"
				created new head
				$ hg bookmark -i dir

				Update - local file conflicts with remote directory:

				$ hg up -q 0
				$ mkdir a
				$ echo 9 > a/b
				$ hg up dir
				a/b: untracked file conflicts with directory
				abort: untracked files in working directory differ from files in requested revision
				[255]
				$ hg up dir --config merge.checkunknown=warn
				a/b: replacing untracked file
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark dir)
				$ cat a/b.orig
				9
				$ rm a/b.orig

				Update - local symlink conflicts with remote directory:

				$ hg up -q 0
				$ mkdir a
				$ ln -s x a/b
				$ hg up dir
				a/b: untracked file conflicts with directory
				abort: untracked files in working directory differ from files in requested revision
				[255]
				$ hg up dir --config merge.checkunknown=warn
				a/b: replacing untracked file
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark dir)
				$ readlink a/b.orig
				x
				$ rm a/b.orig

				Update - local directory conflicts with remote file

				$ hg up -q 0
				$ mkdir -p a/b/c
				$ echo 9 > a/b/c/d
				$ hg up file
				a/b: untracked directory conflicts with file
				abort: untracked files in working directory differ from files in requested revision
				[255]
				$ hg up file --config merge.checkunknown=warn
				a/b: replacing untracked files in directory
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark file)
				$ cat a/b
				1
				$ test -d a/b.orig
				$ rm -rf a/b.orig

				Update - local directory conflicts with remote symlink

				$ hg up -q 0
				$ mkdir -p a/b/c
				$ echo 9 > a/b/c/d
				$ hg up link
				a/b: untracked directory conflicts with file
				abort: untracked files in working directory differ from files in requested revision
				[255]
				$ hg up link --config merge.checkunknown=warn
				a/b: replacing untracked files in directory
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark link)
				$ readlink a/b
				c
				$ test -d a/b.orig
				$ rm -rf a/b.orig

				Update - local renamed file conflicts with remote directory

				$ hg up -q 0
				$ hg mv base a
				$ hg status -C
				A a
				base
				R base
				$ hg up --check dir
				abort: uncommitted changes
				[255]
				$ hg up dir
				a: path conflict - a file or link has the same name as a directory
				the local file has been renamed to a~d20a80d4def3
				resolve manually then use 'hg resolve --mark a'
				1 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				(activating bookmark dir)
				[1]
				$ hg status -C
				A a~d20a80d4def3
				base
				R base
				$ hg resolve --list
				P a
				$ hg up --clean -q 0

				Update clean - local directory conflicts with changed remote file

				$ hg up -q file
				$ rm a/b
				$ mkdir a/b
				$ echo 9 > a/b/c
				$ hg up file2 --check --config merge.checkunknown=warn
				abort: uncommitted changes
				[255]
				$ hg up file2 --clean
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark file2)

This is an archive of the discontinued Mercurial Phabricator instance.

tests: add test for path conflicts during updateClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2557

tests/test-pathconflicts-update.t

tests: add test for path conflicts during update
ClosedPublic

Revision Contents
Changeset List