From: Andrew Oakley Date: Mon, 11 Feb 2019 08:54:05 GMT Subject: Re: [PATCH v2] git-p4: recover from inconsistent perforce history Message-ID: <20190211085405.51d752b7@ado-amd-gentoo.home.adoakley.name> In-Reply-To: <20190208091033.12617-1-andrew@adoakley.name> On Fri, 8 Feb 2019 09:10:33 +0000 andrew@adoakley.name wrote: > From: Andrew Oakley > > Perforce allows you commit files and directories with the same name, > so you could have files //depot/foo and //depot/foo/bar both checked > in. A p4 sync of a repository in this state fails. Deleting one of > the files recovers the repository. > > When this happens we want git-p4 to recover in the same way as > perforce. Unfortunately this still has a few issues: - newer p4d versions don't allow this by default so the tests fail - deleted files get recreated in some cases - command line too long when there are lots of deletions These are all easily fixable, but I'll test more on a real repository with before sharing another patch. -- Andrew Oakley