[TRUNK-2894] Question on reviewing a patch and how to incorporate it

Susan Tan

unread,

Jun 10, 2013, 1:47:53 AM6/10/13

to d...@openmrs.org

I'm currently working on an intro ticket (TRUNK-2894) that already has an un-reviewed patch on it. How do I incorporate the patch into the existing code base (a git branch)? This patch is mostly name changes. In the final step, if I am not mistaken, I have to make a pull request from my git branch on github to the master branch of openmrs-core and then wait for someone to do a final code review on the new commit?

Susan Tan

unread,

Jun 10, 2013, 2:28:58 AM6/10/13

to d...@openmrs.org

This old patch works for the specific line numbers in the previous openmrs-core version and in the most recent openmrs-core folder, the line numbers in that file (messages.properties) have changed! Is there a way to still apply the patch?

Nyoman Ribeka

unread,

Jun 10, 2013, 2:40:22 AM6/10/13

to OpenMRS Dev

On Mon, Jun 10, 2013 at 2:28 AM, Susan Tan <onceuponat...@gmail.com> wrote:

This old patch works for the specific line numbers in the previous openmrs-core version and in the most recent openmrs-core folder, the line numbers in that file (messages.properties) have changed! Is there a way to still apply the patch?

--
OpenMRS Developers: http://go.openmrs.org/dev
Post: d...@openmrs.org
Unsubscribe: dev+uns...@openmrs.org
Manage your OpenMRS subscriptions at https://id.openmrs.org/

--
Thanks,

- Nyoman Ribeka

Harsha Siriwardena

unread,

Jun 10, 2013, 2:41:33 AM6/10/13

to Developers

Hi Tan,

Yes you are correct. And make a comment on the particular Jira Ticket by mentioning the link to your pull request.
You may some useful info here

This old patch works for the specific line numbers in the previous openmrs-core version and in the most recent openmrs-core folder, the line numbers in that file (messages.properties) have changed! Is there a way to still apply the patch?

When you are doing the "pull request" through Github, in some point Github asks from you to choose the which version (the branch) of OpenMRS in a scroll list So you can choose the version you gonna pull against.

Cheers,

Harsha Siriwardena
[harshadura.github.io]

On Mon, Jun 10, 2013 at 11:17 AM, Susan Tan <onceuponat...@gmail.com> wrote:

I'm currently working on an intro ticket (TRUNK-2894) that already has an un-reviewed patch on it. How do I incorporate the patch into the existing code base (a git branch)? This patch is mostly name changes. In the final step, if I am not mistaken, I have to make a pull request from my git branch on github to the master branch of openmrs-core and then wait for someone to do a final code review on the new commit?

--

Susan Tan

unread,

Jun 10, 2013, 3:08:17 AM6/10/13

to d...@openmrs.org

Previously, when I ran "git apply 'PatchName.patch' ", I got error messages like the following:

"error: patch failed: webapp/src/main/webapp/WEB-INF/messages.properties:944

error: webapp/src/main/webapp/WEB-INF/messages.properties: patch does not apply"

The solution:

git apply --reject "PatchName.patch" // this git console command will force-apply the patch.

References:

http://www.lullabot.com/blog/articles/git-best-practices-upgrading-patch-process

Susan Tan

unread,

Jun 10, 2013, 3:29:27 AM6/10/13

to d...@openmrs.org

My first pull request on the open-mrs core: https://github.com/openmrs/openmrs-core/pull/336

Harsha Siriwardena

unread,

Jun 10, 2013, 3:47:43 AM6/10/13

to Developers

Congrats Susan!

Harsha Siriwardena
[harshadura.github.io]

On Mon, Jun 10, 2013 at 12:59 PM, Susan Tan <onceuponat...@gmail.com> wrote:

My first pull request on the open-mrs core: https://github.com/openmrs/openmrs-core/pull/336

--

Reply all

Reply to author

Forward