Web lists-archives.com

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 <simon@xxxxxxxxxxxxxxxxx> 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
> > at the state of any pre-existing files in the target Perforce branch,
> > omiting files added in the shelved changelist.  Currently, only files
> > added (or move 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.
> Looks good to me!
> "omiting" in the comment should perhaps be "omitting".

Thanks and good point.  I'll send the revised patch.

Simon Williams <simon@xxxxxxxxxxxxxxxxx>
PGP Key ID: 0xF4A23C69