On Thu, Dec 10, 2015 at 05:40:17PM +0100, Samuel Thibault wrote:> Urgll... I took git to get the latest code, and assumed that the > latest commit there being 6th november, it was the latest code... Is > there a reason why the master branch is not the trunk? This is really > surprising for any contributor.It is a bit unfortunate, but now we're stuck with it.> My earlier patch was really against 1.1pre11. My latest patch was a > port of it to the git master, thinking it was the latest code...No problem. Now you know for when you're working on the sendmmsg() part :) -- Met vriendelijke groet / with kind regards, Guus Sliepen <guus at tinc-vpn.org> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://www.tinc-vpn.org/pipermail/tinc-devel/attachments/20151210/20dc2a8a/attachment.sig>
Guus Sliepen, on Thu 10 Dec 2015 18:33:09 +0100, wrote:> On Thu, Dec 10, 2015 at 05:40:17PM +0100, Samuel Thibault wrote: > > Urgll... I took git to get the latest code, and assumed that the > > latest commit there being 6th november, it was the latest code... Is > > there a reason why the master branch is not the trunk? This is really > > surprising for any contributor. > > It is a bit unfortunate, but now we're stuck with it.Why? Is it used for something? One can force an update, effectively dropping the existing spurious commits. Samuel
On Thu, Dec 10, 2015 at 06:39:47PM +0100, Samuel Thibault wrote:> Guus Sliepen, on Thu 10 Dec 2015 18:33:09 +0100, wrote: > > On Thu, Dec 10, 2015 at 05:40:17PM +0100, Samuel Thibault wrote: > > > Urgll... I took git to get the latest code, and assumed that the > > > latest commit there being 6th november, it was the latest code... Is > > > there a reason why the master branch is not the trunk? This is really > > > surprising for any contributor. > > > > It is a bit unfortunate, but now we're stuck with it. > > Why? Is it used for something? One can force an update, effectively > dropping the existing spurious commits.It's used for the 1.0 branch, which still gets updates now and then. Since there are other people who cloned/forked the git repository and may want to sync, I won't change the master branch (yet). -- Met vriendelijke groet / with kind regards, Guus Sliepen <guus at tinc-vpn.org> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://www.tinc-vpn.org/pipermail/tinc-devel/attachments/20151210/e3d93d0e/attachment.sig>