From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org, viniciusalexandre@gmail.com,
"Romain Merland" <merlorom@yahoo.fr>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Vitor Antunes" <vitor.hda@gmail.com>,
amazo@checkvideo.com, aoakley@roku.com
Cc: Luke Diamand <luke@diamand.org>
Subject: [PATCH 0/2] git-p4: handle moved files when updating a P4 shelve
Date: Sun, 13 Jan 2019 13:58:13 +0000 [thread overview]
Message-ID: <20190113135815.11286-1-luke@diamand.org> (raw)
I found this bug recently in git-p4 - updating a shelved changelist where files
are being moved doesn't work. The destination of any moves needs to be
added to the list of files passed to P4.
Luke Diamand (2):
git-p4: add failing test for shelved CL update involving move
git-p4: handle update of moved files when updating a shelve
git-p4.py | 1 +
t/t9807-git-p4-submit.sh | 53 +++++++++++++++++++++++++++++++++++++---
2 files changed, 51 insertions(+), 3 deletions(-)
--
2.20.1.100.g9ee79a14a8
next reply other threads:[~2019-01-13 13:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-13 13:58 Luke Diamand [this message]
2019-01-13 13:58 ` [PATCH 1/2] git-p4: add failing test for shelved CL update involving move Luke Diamand
2019-01-13 13:58 ` [PATCH 2/2] git-p4: handle update of moved files when updating a shelve Luke Diamand
2019-01-13 21:57 ` [PATCH 1/2] git-p4: add failing test for shelved CL update involving move Eric Sunshine
2019-01-14 19:03 ` Junio C Hamano
2019-01-14 18:56 ` [PATCH 0/2] git-p4: handle moved files when updating a P4 shelve Junio C Hamano
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=20190113135815.11286-1-luke@diamand.org \
--to=luke@diamand.org \
--cc=amazo@checkvideo.com \
--cc=aoakley@roku.com \
--cc=git@vger.kernel.org \
--cc=merlorom@yahoo.fr \
--cc=szeder.dev@gmail.com \
--cc=viniciusalexandre@gmail.com \
--cc=vitor.hda@gmail.com \
/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).