[assign] Merge request for type disambiguation with C++11
https://github.com/boostorg/assign/pull/3 The merge base was somehow ignored, not sure what happened there, but the set of changes is in the last commit. Ben
On 23 April 2014 16:35, Ben Pope
https://github.com/boostorg/assign/pull/3
The merge base was somehow ignored, not sure what happened there, but the set of changes is in the last commit.
You appear to have branched from master so you've got some of master's history that isn't in develop.
On Wednesday, April 23, 2014 11:55 PM, Daniel James wrote:
On 23 April 2014 16:35, Ben Pope
wrote: https://github.com/boostorg/assign/pull/3
The merge base was somehow ignored, not sure what happened there, but the set of changes is in the last commit.
You appear to have branched from master so you've got some of master's history that isn't in develop.
Thanks, I appear to have made a mess. I'll figure git out one day. Ben
-----Original Message----- From: Boost [mailto:boost-bounces@lists.boost.org] On Behalf Of Ben Pope Sent: 23 April 2014 18:13 To: boost@lists.boost.org Subject: Re: [boost] [assign] Merge request for type disambiguation with C++11
On Wednesday, April 23, 2014 11:55 PM, Daniel James wrote:
On 23 April 2014 16:35, Ben Pope
wrote: https://github.com/boostorg/assign/pull/3
The merge base was somehow ignored, not sure what happened there, but the set of changes is in the last commit.
You appear to have branched from master so you've got some of master's history that isn't in develop.
Thanks, I appear to have made a mess. I'll figure git out one day.
Linus Torvalds didn't call it "The Information Manager from Hell" for nothing ;-) Paul --- Paul A. Bristow Prizet Farmhouse Kendal UK LA8 8AB +44 01539 561830
On 23 April 2014 18:12, Ben Pope
Thanks, I appear to have made a mess. I'll figure git out one day.
I cherry-picked it into develop: https://github.com/boostorg/assign/pull/4 Since this was first reported 4 months ago (https://svn.boost.org/trac/boost/ticket/9540) I'll merge it in a couple of days if no one objects.
On 24 April 2014 09:15, Daniel James
Since this was first reported 4 months ago (https://svn.boost.org/trac/boost/ticket/9540) I'll merge it in a couple of days if no one objects.
Or maybe we should ask for it to be added to the community maintenance team's repos. I don't want to abuse my write permission.
On 24-04-2014 10:23, Daniel James wrote:
On 24 April 2014 09:15, Daniel James
wrote: Since this was first reported 4 months ago (https://svn.boost.org/trac/boost/ticket/9540) I'll merge it in a couple of days if no one objects.
Or maybe we should ask for it to be added to the community maintenance team's repos. I don't want to abuse my write permission.
No abuse AFAICT. regards Thorsten
On 24 April 2014 10:02, Thorsten Ottosen
On 24-04-2014 10:23, Daniel James wrote:
On 24 April 2014 09:15, Daniel James
wrote: Since this was first reported 4 months ago (https://svn.boost.org/trac/boost/ticket/9540) I'll merge it in a couple of days if no one objects.
Or maybe we should ask for it to be added to the community maintenance team's repos. I don't want to abuse my write permission.
No abuse AFAICT.
OK, I just pushed to develop.
You appear to have branched from master so you've got some of master's history that isn't in develop.
Shouldn't master be merged back into develop to avoid this mess? I don't understand why master would have commits not included in develop. -- View this message in context: http://boost.2283326.n4.nabble.com/assign-Merge-request-for-type-disambiguat... Sent from the Boost - Dev mailing list archive at Nabble.com.
participants (5)
-
Ben Pope
-
Daniel James
-
Paul A. Bristow
-
pfultz2
-
Thorsten Ottosen