Hi Colm,
Thanks, that worked.
Best Regards,
Andriy Redko
COh> Hi Andriy,
COh> You could try running DoMerges again on 3.2.x-fixes and just mark the
commit as "record".
COh> Colm.
COh> On Fri, Nov 23, 2018 at 12:09 PM Andriy Redko <[email protected]> wrote:
COh> Hi Colm,
COh> I have done the cherry-pick to 3.2.x today, the tool seemed to work fine
COh> but failed at the end, since I have a few untracked files (not staged for
any
COh> commits)
COh> $ java -cp ./bin DoMerges -me
COh> ....
COh> nothing added to commit but untracked files present
COh> ERROR!
COh> The commit was cherry-picked successfully but .gitmergeinfo was not
changed
COh> and stayed in modified state (git diff shows no changes):
COh> $ git status
COh> modified: .gitmergeinfo
COh> I pushed it like that (thet cherrypicked commit only), without amending
the .gitmergeinfo manually.
COh> Any hints on the process?
COh> Thanks!
COh> Best Regards,
COh> Andriy Redko
COh>> Hi CXF devs,
COh>> Just a reminder when you are backmerging to 3.2.x-fixes to use Dan's
COh>> DoMerges class instead of "git cherry-pick":
COh>> https://github.com/apache/cxf/blob/master/bin/DoMerges.java
COh>> I copied that file to a ~/bin directory and compiled it there. Then when
COh>> you merge to master and want to cherry-pick on 3.2.x-fixes do:
COh>> java -cp ~/bin DoMerges -me
COh>> That will list all merges that you have done to master that have yet to
be
COh>> merged to 3.2.x-fixes.
COh>> Thanks,
COh>> Colm.
