[PATCH v2] git-p4: Allow unshelving of branched files

targets) are classed as new. However, files integrated from other branches (i.e. a 'branch' action) also need to be considered as added, for this purpose. Signed-off-by: Simon Williams Signed-off-by: Luke Diamand --- git-p4.py | 2 +- t/t9832-unshelve.sh | 8 +++- 2 fil

Re: [PATCH] git-p4: Allow unshelving of branched files

On Wed, May 22, 2019 at 06:49:38AM +0100, Luke Diamand wrote: > On Tue, 21 May 2019 at 23:50, Simon Williams wrote: > > > > When unshelving a changelist, git-p4 tries to work out the appropriate > > parent commit in a given branch (default: HEAD). To do this, it looks > &

[PATCH] git-p4: Allow unshelving of branched files

targets) are classed as new. However, files integrated from other branches (i.e. a 'branch' action) also need to be considered as added, for this purpose. Signed-off-by: Simon Williams --- git-p4.py | 2 +- t/t9832-unshelve.sh | 8 +++- 2 files changed, 8 insertions(+), 2