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

2019-02-11 Thread Andrew Oakley
On Fri, 8 Feb 2019 09:10:33 + and...@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 f

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

2019-02-08 Thread Andrew Oakley
On Thu, 7 Feb 2019 08:04:20 + Luke Diamand wrote: > On Wed, 6 Feb 2019 19:42:19 + > and...@adoakley.name wrote: > > > From: Andrew Oakley > > > > Perforce allows you commit files and directories with the same > > name, so you could have files //d

[PATCH] git-p4: improve branch option handling

2017-04-20 Thread Andrew Oakley
. The P4Submit command has been simplified to not call P4Sync itself, it lets P4Rebase do it instead (now that the branch can be handled). This fixes an issue where P4Submit does a sync of the requested branch and then does a rebase which does a sync of all branches. Signed-off-by: Andrew Oakley

[PATCH 1/1] git-p4: correct hasBranchPrefix verbose output

2016-06-22 Thread Andrew Oakley
The logic here was inverted, you got a message saying the file is ignored for each file that is not ignored. Signed-off-by: Andrew Oakley --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index b6593cf..b123aa2 100755 --- a/git-p4.py +++ b

Re: [PATCH 1/1] git-p4: correct hasBranchPrefix verbose output

2016-06-22 Thread Andrew Oakley
On 21/06/16 19:16, Junio C Hamano wrote: > Thanks. This needs sign-off, though. Sorry, didn't realise I needed to do that! Will resend with sign off. Thanks -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo inf

[PATCH 1/1] git-p4: correct hasBranchPrefix verbose output

2016-06-21 Thread Andrew Oakley
The logic here was inverted, you got a message saying the file is ignored for each file that is not ignored. --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index b6593cf..b123aa2 100755 --- a/git-p4.py +++ b/git-p4.py @@ -2674,7 +2674,7 @@ c