Web lists-archives.com

Re: [PATCH 1/1] git-p4: recover from inconsistent perforce history




On Thu, 7 Feb 2019 08:04:20 +0000
Luke Diamand <luke@xxxxxxxxxxx> wrote:

> On Wed,  6 Feb 2019 19:42:19 +0000
> andrew@xxxxxxxxxxxxx wrote:
> 
> > From: Andrew Oakley <andrew@xxxxxxxxxxxxx>
> > 
> > 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.  
> 
> I'm finding the test fails for me on a clean git repo, although I
> can't see any obvious reason why.

This introduced a failure when client specs are being used.  I wasn't
populating the cache (update_client_spec_path_cache) before checking if
a file should be included (inClientSpec).  I can rearrange the code to
fix this.

Thanks

-- 
Andrew Oakley