[Swan-dev] confused about ikev2-pam branch

[Antony Antony]

I moved the branch you worked on to ikev2-pam-old. That branch coming to end of its life.

the new ikev2-pam incorporate the relevant, ikev2-pam, changes you made in two commits.  The remaining changes are outside ikev2-pam, e.g example changes to ikev1_xauth.c, log.c, or nat_traversal.c   I hopping to find time to incorporate those changes to master. `

e9fd8f177e22872c4cd43b3a0bebe718863ed639 
335ae8cf7713f2fbabd4f621035906d99f5ed301

-antony



On Sat, Feb 21, 2015 at 02:20:04PM -0500, D. Hugh Redelmeier wrote:
> I just tried to check out ikev2-pam.  I think that I had previously
> pushed all my changes to this branch.
> 
>     $ git checkout ikev2-pam
>     Switched to branch 'ikev2-pam'
>     Your branch and 'origin/ikev2-pam' have diverged,
>     and have 49 and 93 different commits each, respectively.
>       (use "git pull" to merge the remote branch into yours)
> 
> How does this happen?  I would assume that origin would have all the
> commits that I had pushed and yet this appears to not be the case.
> 
> What's the best way to figure this out without stepping into a big
> merge mess?
> _______________________________________________
> Swan-dev mailing list
> Swan-dev at lists.libreswan.org
> https://lists.libreswan.org/mailman/listinfo/swan-dev
>