Unique key name isn't correctly set - DDC-1603 #261

Merged
merged 2 commits into from Jan 17, 2012

Projects

None yet

5 participants

@armetiz
Contributor
armetiz commented Jan 16, 2012

No description provided.

@stof
Member
stof commented Jan 16, 2012

duplicate of #260

@armetiz
Contributor
armetiz commented Jan 16, 2012

Yes,
Both PR is on the same file, but not on the same line.

Right now I don't know how merge the two PR & Issues.
Maybe, the only solution is to close both PR & Issues and to create a new one that include fixes ?

@stof
Member
stof commented Jan 16, 2012

add another commit in the same branch to update the existing PR, and close the second one

@guilhermeblanco guilhermeblanco merged commit 2bb5115 into doctrine:master Jan 17, 2012
@guilhermeblanco
Member

@beberlei please merge to 2.1 and 2.2

@mvrhov
Contributor
mvrhov commented on 21c9be7 Jan 25, 2012

This one should also be merged to 2.2!
And here is there is a reason for another RC :P

Member

done

@armetiz
Contributor
armetiz commented Jan 25, 2012

@mvrhov I'm not an expert in git / github, but I think that is already merged in 2.1 & 2.2

https://github.com/doctrine/doctrine2/commits/2.2
https://github.com/doctrine/doctrine2/commits/2.1.x

Also, the 2.2.0R-C1 seems to use this commit :
https://github.com/doctrine/doctrine2/commits/2.2.0-RC1

@mvrhov
Contributor
mvrhov commented Jan 25, 2012

It seems not. If you take a look at 2.2 branch you'll see that the second commit is missing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment