Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPR-8938 #9

Closed
wants to merge 3 commits into from
Closed

SPR-8938 #9

wants to merge 3 commits into from

Conversation

costin
Copy link

@costin costin commented Dec 22, 2011

  • update documentation
  • add a# as an alias to p# for specifying method arguments

Costin Leau added 3 commits December 22, 2011 13:38
+ update documentation
+ add a# as an alias to p# for specifying method arguments
+ properly parse key-generator on annotation-driven namespace
+ add extra integration test to check for the issue (still can't reproduce it)
@cbeams
Copy link
Contributor

cbeams commented Dec 22, 2011

Hi Costin,

These changes are now committed, but they have been cherry-picked instead of merged in order to cope with a number of local changes to the 3.1.x branch that you could not yet have seen. You may be well aware of how to deal with such a situation, but just in case: you'll need to reset your 3.1.x branch against origin in order to reconcile the differences, e.g.

$ git fetch origin
$ git reset --hard 3.1.x origin/3.1.x

The above assumes that you don't have any additional commits on 3.1.x since the ones you've submitted here. There are ways to deal with that too, if necessary.

A few other things, since we're just getting started with the whole pull request thing:

  • You'll notice that I've updated the comments for each commit, generally following the guidelines laid out in Pro Git. Would you mind moving to this style for your commits against the framework?
  • I think it'll be a good idea going forward to submit separate pull requests for separate atomic changes / JIRA issues. That way any discussion thread can be dedicated to a single issue and not hold up the others making it in on their own.
  • We'll get something set up in JIRA that allows you to transition issues into a "pull request submitted" or "waiting for review" state so that you don't have to actually resolve issues that have not yet been merged. Until then, just keep doing what you're doing and I'll keep an eye on things; just thought I'd mention.
  • You'll notice that I added 3.2 M1 as a fixVersion to the issues as well. You can do the same going forward, since these issues really do need to be applied to both branches.
  • If you sync up and look at repository history in gitk (or whatever you use), you'll see that your changes have been applied against 3.1.x and then merged against master (3.2.x). This will be the way things generally get done, just so you know.

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants