From: Andrew Oakley <andrew@adoakley.name>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Luke Diamand <luke@diamand.org>
Subject: Re: [PATCH v2] git-p4: recover from inconsistent perforce history
Date: Mon, 11 Feb 2019 08:54:05 +0000 [thread overview]
Message-ID: <20190211085405.51d752b7@ado-amd-gentoo.home.adoakley.name> (raw)
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 <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.
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
prev parent reply other threads:[~2019-02-11 8:54 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
2019-02-08 9:10 ` [PATCH v2] " andrew
2019-02-11 8:54 ` Andrew Oakley [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190211085405.51d752b7@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).