From: Pete Wyckoff <pw@padd.com>
To: Luke Diamand <luke@diamand.org>
Cc: git@vger.kernel.org, Gary Gibbons <ggibbons@perforce.com>
Subject: Re: [PATCH 1/4] git p4: bring back files in deleted client directory
Date: Mon, 30 Apr 2012 08:36:50 -0400 [thread overview]
Message-ID: <20120430123650.GB25045@padd.com> (raw)
In-Reply-To: <4F9E376B.1000107@diamand.org>
luke@diamand.org wrote on Mon, 30 Apr 2012 07:55 +0100:
> On 30/04/12 01:57, Pete Wyckoff wrote:
> >The code to auto-create the client directory, added in 0591cfa
> >(git-p4: ensure submit clientPath exists before chdir,
> >2011-12-09), works when the client directory never existed.
> >
> >But if the directory is summarily removed without telling p4,
> >the sync operation will not bring back all the files. Always
> >do "sync -f" if the client directory is newly created.
>
> I'm possibly missing something obvious here, but
> ./t9807-git-p4-submit.sh fails with this change.
>
> Rebasing the current branch onto remotes/p4/master
> First, rewinding head to replay your work on top of it...
> File file1 doesn't exist. file1
> not ok - 3 submit with no client dir
I can't figure it out. Will you help debug a bit? Something
like this maybe.
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index f23b4c3..e98cc5e 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -31,6 +31,7 @@ test_expect_success 'submit with no client dir' '
) &&
(
cd "$cli" &&
+ pwd && ls -la && p4 sync && ls -la &&
test_path_is_file file1 &&
test_path_is_file file2
)
And if the other "submit modify" etc. tests don't work, it
could be fallout from this one. Deleting "$cli" is perhaps
at fault: permissions, ... ?
Or somehow I completely broke things.
I'll try with a newer version of p4, to see if there's a
dependency there.
Thanks for checking!
-- Pete
next prev parent reply other threads:[~2012-04-30 12:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 0:57 [PATCH 0/4] git p4 submit fixes Pete Wyckoff
2012-04-30 0:57 ` [PATCH 1/4] git p4: bring back files in deleted client directory Pete Wyckoff
2012-04-30 6:55 ` Luke Diamand
2012-04-30 12:36 ` Pete Wyckoff [this message]
2012-04-30 18:34 ` Luke Diamand
2012-04-30 21:56 ` Pete Wyckoff
2012-04-30 0:57 ` [PATCH 2/4] git p4: test submit Pete Wyckoff
2012-04-30 0:57 ` [PATCH 3/4] git p4: fix writable file after rename or copy Pete Wyckoff
2012-04-30 0:57 ` [PATCH 4/4] git p4: submit files with wildcards Pete Wyckoff
2012-04-30 18:34 ` Luke Diamand
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=20120430123650.GB25045@padd.com \
--to=pw@padd.com \
--cc=ggibbons@perforce.com \
--cc=git@vger.kernel.org \
--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 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 NNTP newsgroup(s).