[ITK-dev] Proper ThirdParty (GDCM specifically) update procedure?

[Sean McBride]

On Mon, 25 Sep 2017 20:19:03 +0200, Mathieu Malaterre said:

>Hi Sean,
>
>On Mon, Sep 25, 2017 at 7:40 PM, Sean McBride <sean at rogue-research.com> wrote:
>> Hi all,
>>
>> I'm going to try to update ITK's GDCM... are there docs for this procedure?
>>
>> I know about the ITK/Modules/ThirdParty/GDCM/UpdateFromUpstream.sh
>script, but I'm wondering things like:
>>  - do I run it on the master branch, or should I first create a branch
>of my own?
>>  - running the script creates a branch called 'upstream-gdcm'. After
>the script runs, there are conflicts.  After I just resolve them
>manually, which branch do I commit to?
>
>Thanks for being very brave.

:)

There are about 30 conflicted files, so indeed it's going to be at least a little painful. :)  That's why I want to be sure I do the git stuff right, as I don't want to have to manually unconflict dozens of files twice.

>If I have one comment: please upgrade
>from the release branch instead of the default master branch. I
>vaguely remember the script tracks git/master.

It's pointing to this currently:

upstream_git_url='http://git.code.sf.net/p/gdcm/gdcm.git'
upstream_git_branch='release'

That correct?

Cheers,

-- 
____________________________________________________________
Sean McBride, B. Eng                 sean at rogue-research.com
Rogue Research                        www.rogue-research.com 
Mac Software Developer              Montréal, Québec, Canada