This is an archive of the discontinued Mercurial Phabricator instance.

	adding dir1/a			adding dir1/a
	adding dir2/subdir/a			adding dir2/subdir/a
	abort: path 'dir1/a' needs to be mirrored to 'dir2/subdir/a', but the target already has pending changes			abort: path 'dir1/a' needs to be mirrored to 'dir2/subdir/a', but the target already has pending changes
	[255]			[255]

	Test non-conflicting edits			Test non-conflicting edits
	$ echo a > dir2/subdir/a			$ echo a > dir2/subdir/a
	$ hg commit -Am "add non-conflicting changes"			$ hg commit -Am "add non-conflicting changes"
				adding dir1/a
				adding dir2/subdir/a
	not mirroring 'dir1/a' to 'dir2/subdir/a'; it already matches			not mirroring 'dir1/a' to 'dir2/subdir/a'; it already matches
	not mirroring 'dir2/subdir/a' to 'dir1/a'; it already matches			not mirroring 'dir2/subdir/a' to 'dir1/a'; it already matches
	committing files:			committing files:
	dir1/a			dir1/a
	dir2/subdir/a			dir2/subdir/a
	committing manifest			committing manifest
	committing changelog			committing changelog
	committed changeset 3:787a1ee839ea			committed changeset 3:787a1ee839ea

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1035		Aug 17 2017, 2:00 PM	★	★
Diff 2	1069	rFBHGX75cfcc6fc62a4f172857beebda6c0e43f318ea87	Aug 18 2017, 6:11 AM	★	★

dirsync: update tests for upstream behavior changeClosedPublic