Re: [lmi] Branching to replace XSL-FO

[Greg Chicares]

On 2018-01-29 16:41, Vadim Zeitlin wrote:
> On Mon, 29 Jan 2018 16:13:10 +0000 Greg Chicares <address@hidden> wrote:
> 
> GC> On 2017-10-28 20:16, Vadim Zeitlin wrote:
> GC> [...]
> GC> > Let's just put in place the original plan: please
> GC> > integrate the changes in your GWC branch in whichever you see fit, 
> without
> GC> > caring about the history, and then let's do the merge with the VZ branch
> GC> > using "ours" strategy at the end to graft the original history of these
> GC> > changes.
> GC> I'm ready to do the merge now. IIRC, the idea is to merge "my" branch:
> GC>   http://git.savannah.nongnu.org/cgit/lmi.git/log/?h=gwc-no-xslfo
> GC> into "your" PDF branch:
> GC>   https://github.com/vadz/lmi/tree/direct-pdf-gen-master
> GC> and then merge the result into 'master'. But I've never done anything
> GC> like this before, so could I ask you to spell out the commands, please?
> 
>  I am not sure why would you prefer to merge gwc-no-xslfo branch into
> direct-pdf-gen-master as this is a more difficult way of arriving to the
> same result, AFAICS.

Then my "IIRC" tagged a misunderstanding on my part, because this works:

> I planned to merge direct-pdf-gen-master into
> gwc-no-xslfo (which can be merged in master later, of course) which is as
> simple as
> 
>       $ git merge --strategy ours vz/direct-pdf-gen-master

Indeed, all files in the working copy remain identical, and the history
seems to have become integrated, e.g.:

git log --pretty=format:"%h %ar %an %s" test_coding_rules.cpp

1b4310455 25 hours ago Gregory W. Chicares Update copyright notices
f29483178 2 days ago Gregory W. Chicares Mark some deferred PDF issues
c216db3dd 2 days ago Gregory W. Chicares Allow 'PDF !!' markers
6942a3456 5 days ago Gregory W. Chicares Improve concinnity
ef516d891 7 days ago Gregory W. Chicares Permit files dated 2017 to be committed
cc80196c2 7 days ago Gregory W. Chicares Import 'test_coding_rules.cpp' verbatim
08984bb87 4 months ago Vadim Zeitlin Recognize Mustache files in the coding 
rules test
f6977a5f2 4 months ago Gregory W. Chicares Enable '-Wshadow', addressing all 
the remaining diagnostics it produced
5dcfd5f22 4 months ago Gregory W. Chicares Guard inclusion of 'boost/regex.hpp' 
with a pragma

...where, prior to the merge, your 08984bb87 was not in the history.

Now that this has apparently succeeded, what's the final command to
merge this integrated branch into 'master'?