Up to Discussions in Documentation

This Question is Answered

1 "correct" answer available (4 pts) 2 "helpful" answers available (2 pts)
9 Replies Last post: May 31, 2007 5:22 PM by Dmitry Jemerov  
Johan Lund Newbie
Johan Lund
55 posts since
Jul 24, 2006
Currently Being Moderated

Apr 23, 2007 5:13 PM

Create Patch

I noticed a button saying "Create Patch" when committing a file using subversion.

I did not find any info on this in the manual. There is a screenshot of the commit window in the manual but on the screenshot it says "Remote run".

 

What is this "Create Patch"?

Guest
Dmitry Jemerov
Currently Being Moderated
Apr 23, 2007 5:15 PM in response to: Johan Lund
Re: Create Patch

Hello Johan,

 

I noticed a button saying "Create Patch" when committing a file using

subversion.

 

I did not find any info on this in the manual. There is a screenshot

of the commit window in the manual but on the screenshot it says

"Remote run".

 

What is this "Create Patch"?

 

http://en.wikipedia.org/wiki/Patch_%28Unix%29

 

--

Dmitry Jemerov

Software Developer

JetBrains, Inc.

http://www.jetbrains.com/

"Develop with Pleasure!"

 

 

 

Johan Lund Newbie
Johan Lund
55 posts since
Jul 24, 2006
Currently Being Moderated
Apr 23, 2007 5:57 PM in response to: Johan Lund
Re: Create Patch

Aha, thats nice. So I can use this to apply changes to several different branches.

 

Is there a way to create patches from somewhere else but the commit dialog?

 

For example; Sometime ago a change was made to branch_1 that should have been checked in on branch_2 also. But it wasn't. Several changes has been made since then.

What can I do besides manually copying the changes into the other branch?

Report Abuse
Guest
Dmitry Jemerov
Currently Being Moderated
Apr 23, 2007 6:19 PM in response to: Johan Lund
Re: Create Patch

Hello Johan,

 

Aha, thats nice. So I can use this to apply changes to several

different branches.

 

Is there a way to create patches from somewhere else but the commit

dialog?

 

For example; Sometime ago a change was made to branch_1 that should

have been checked in on branch_2 also. But it wasn't. Several changes

has been made since then.

 

What can I do besides manually copying the changes into the other

branch?

 

In the build 6913, "Create Patch" can also be invoked from the Committed

Changes tab in Changes view (which is also accessible through Browse Changes

action).

 

--

Dmitry Jemerov

Software Developer

JetBrains, Inc.

http://www.jetbrains.com/

"Develop with Pleasure!"

 

 

 

Simon Knott Novice
Simon Knott
412 posts since
Sep 9, 2002
Currently Being Moderated
Apr 23, 2007 6:29 PM in response to: Johan Lund
Re: Create Patch

If you use the commited tab of the changes window, you can find the commit revision in question and create a patch based off the revision.  Or at least that's the idea It went in in the last build and it doesn't appear to work here, it just throws the error:

 

Error creating patch: null

 

No exception is thrown, so I'm not sure what's going on.  I haven't got around to raising it in JIRA yet though...

Report Abuse
Guest
Dmitry Jemerov
Currently Being Moderated
Apr 23, 2007 6:55 PM in response to: Simon Knott
Re: Create Patch

Hello Simon,

 

If you use the commited tab of the changes window, you can find the

commit revision in question and create a patch based off the revision.

Or at least that's the idea It went in in the last build and it

doesn't appear to work here, it just throws the error:

 

Error creating patch: null

 

No exception is thrown, so I'm not sure what's going on.  I haven't

got around to raising it in JIRA yet though...

 

What VCS are you using? Are there any exceptions in idea.log?

 

--

Dmitry Jemerov

Software Developer

JetBrains, Inc.

http://www.jetbrains.com/

"Develop with Pleasure!"

 

 

 

Simon Knott Novice
Simon Knott
412 posts since
Sep 9, 2002
Currently Being Moderated
Apr 23, 2007 7:17 PM in response to: Guest
Re: Create Patch

I've just created IDEA-12487

Report Abuse
Johan Lund Newbie
Johan Lund
55 posts since
Jul 24, 2006
Currently Being Moderated
Apr 23, 2007 7:12 PM in response to: Johan Lund
Re: Create Patch

I have the same problem. Cannot create patch.

Here is the error message from idea.log:

 

2007-04-23 17:10:35,819 291453   INFO - atch.CreatePatchCommitExecutor - 

java.lang.NullPointerException

     at com.intellij.openapi.diff.impl.patch.PatchBuilder.a(PatchBuilder.java:64)

     at com.intellij.openapi.diff.impl.patch.PatchBuilder.a(PatchBuilder.java:103)

     at com.intellij.openapi.diff.impl.patch.PatchBuilder.buildPatch(PatchBuilder.java:112)

     at com.intellij.openapi.vcs.changes.patch.CreatePatchCommitExecutor$CreatePatchCommitSession.execute(CreatePatchCommitExecutor.java:33)

     at com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction.actionPerformed(CreatePatchFromChangesAction.java:23)

     at com.intellij.openapi.actionSystem.impl.ActionButton.a(ActionButton.java:122)

     at com.intellij.openapi.actionSystem.impl.ActionButton.performAction(ActionButton.java:105)

     at com.intellij.openapi.actionSystem.impl.ActionButton.processMouseEvent(ActionButton.java:47)

     at java.awt.Component.processEvent(Component.java:5266)

     at java.awt.Container.processEvent(Container.java:1966)

     at java.awt.Component.dispatchEventImpl(Component.java:3968)

     at java.awt.Container.dispatchEventImpl(Container.java:2024)

     at java.awt.Component.dispatchEvent(Component.java:3803)

     at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4212)

     at java.awt.LightweightDispatcher.processMouseEvent(Container.java:3892)

     at java.awt.LightweightDispatcher.dispatchEvent(Container.java:3822)

     at java.awt.Container.dispatchEventImpl(Container.java:2010)

     at java.awt.Window.dispatchEventImpl(Window.java:1778)

     at java.awt.Component.dispatchEvent(Component.java:3803)

     at java.awt.EventQueue.dispatchEvent(EventQueue.java:463)

     at com.intellij.ide.IdeEventQueue.b(IdeEventQueue.java:144)

     at com.intellij.ide.IdeEventQueue.a(IdeEventQueue.java:139)

     at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:89)

     at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:242)

     at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163)

     at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:157)

     at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:149)

     at java.awt.EventDispatchThread.run(EventDispatchThread.java:110)

2007-04-23 17:10:45,881 301515   INFO - lij.localVcs.impl.LocalVcsImpl - purged 0 items

Report Abuse
steven Newbie
steven
5 posts since
May 31, 2007
Currently Being Moderated
May 31, 2007 4:51 PM in response to: Johan Lund
Re: Create Patch

Hi,

i'm trying to appply a patch to a file but i got this error:

 

failed to apply patch for file  ..  :couldn't find context  !!

Report Abuse
Guest
Dmitry Jemerov
Currently Being Moderated
May 31, 2007 5:22 PM in response to: steven
Re: Create Patch

Hello steven,

 

i'm trying to appply a patch to a file but i got this error:

failed to apply patch for file  ..  :couldn't find context  !!

 

This usually means that the base version of the file used to create the patch

is completely different from the version of the file you have locally.

 

--

Dmitry Jemerov

Software Developer

JetBrains, Inc.

http://www.jetbrains.com/

"Develop with Pleasure!"

 

 

 

More Like This

  • Retrieving data ...