All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Oakley <andrew@adoakley.name>
To: Luke Diamand <luke@diamand.org>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/1] git-p4: recover from inconsistent perforce history
Date: Fri, 8 Feb 2019 09:07:04 +0000	[thread overview]
Message-ID: <20190208090704.68154885@ado-amd-gentoo.home.adoakley.name> (raw)
In-Reply-To: <20190207080420.395c521be017dafb6561784b@diamand.org>

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

> On Wed,  6 Feb 2019 19:42:19 +0000
> andrew@adoakley.name wrote:
> 
> > From: Andrew Oakley <andrew@adoakley.name>
> > 
> > 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

  reply	other threads:[~2019-02-08  9:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-06 19:42 [PATCH 1/1] git-p4: recover from inconsistent perforce history andrew
2019-02-07  8:04 ` Luke Diamand
2019-02-08  9:07   ` Andrew Oakley [this message]
2019-02-08  9:10     ` [PATCH v2] " andrew
2019-02-11  8:54       ` Andrew Oakley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190208090704.68154885@ado-amd-gentoo.home.adoakley.name \
    --to=andrew@adoakley.name \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=luke@diamand.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.