[Swan-dev] merging doubt
Paul Wouters
paul at nohats.ca
Sun Jun 14 07:21:19 EEST 2015
On Sat, 13 Jun 2015, D. Hugh Redelmeier wrote:
> I just merged upstream master into my master and the result into my
> rfc7383.
>
> The result gets an error because enc_payload_summary is used but not
> defined. It turns out not all of
> commit aae662ce8b6ab837bc6f147e5efbe5e860470a00 got incorporated. I
> wonder why?
odd. and there are no merge conflicts left unresolved??
> It's good that it raised a compiler error. I wonder how much other
> damage there is. I wonder how to find it.
That's difficult - try git diff branch1 branch2 ?
Note I have some pending liveness (or rather informational msgid) fixes
too, but I need to run it through our liveness test cases first before
pushing.
Paul
More information about the Swan-dev
mailing list