mbox series

[PATCHv3,0/2] git-p4: shelved change update with move/copy

Message ID 20190118093656.16521-1-luke@diamand.org (mailing list archive)
Headers show
Series git-p4: shelved change update with move/copy | expand

Message

Luke Diamand Jan. 18, 2019, 9:36 a.m. UTC
This updates the patchset to support copy, as suggested by Andrey.

Luke Diamand (2):
  git-p4: add failing test for shelved CL update involving move/copy
  git-p4: handle update of moved/copied files when updating a shelve

 git-p4.py                |  2 ++
 t/t9807-git-p4-submit.sh | 57 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 3 deletions(-)

Comments

Junio C Hamano Jan. 18, 2019, 5:46 p.m. UTC | #1
Luke Diamand <luke@diamand.org> writes:

> This updates the patchset to support copy, as suggested by Andrey.
>
> Luke Diamand (2):
>   git-p4: add failing test for shelved CL update involving move/copy
>   git-p4: handle update of moved/copied files when updating a shelve
>
>  git-p4.py                |  2 ++
>  t/t9807-git-p4-submit.sh | 57 +++++++++++++++++++++++++++++++++++++---
>  2 files changed, 56 insertions(+), 3 deletions(-)

Thanks.

This has been listed among those that have been planned to be merged
down to 'next', which I wanted to do today.  I'll replace it with
this round and merge it in a few days.
Mazo, Andrey Jan. 22, 2019, 6:16 p.m. UTC | #2
> This updates the patchset to support copy, as suggested by Andrey.
> 
> Luke Diamand (2):
>   git-p4: add failing test for shelved CL update involving move/copy
>   git-p4: handle update of moved/copied files when updating a shelve
> 
>  git-p4.py                |  2 ++
>  t/t9807-git-p4-submit.sh | 57 +++++++++++++++++++++++++++++++++++++---
>  2 files changed, 56 insertions(+), 3 deletions(-)

Thank you for addressing my comments!
The updated patchset looks good to me:
Acked-by: Andrey Mazo <amazo@checkvideo.com>

Thank you,
Andrey