Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 341036 - Team > Create patch is missing
Summary: Team > Create patch is missing
Status: VERIFIED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 major (vote)
Target Milestone: 1.3-M1   Edit
Assignee: Matthias Sohn CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 361502 (view as bug list)
Depends on:
Blocks: 358616 367735
  Show dependency tree
 
Reported: 2011-03-26 11:48 EDT by Marc Bauer CLA
Modified: 2012-01-05 05:43 EST (History)
18 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Marc Bauer CLA 2011-03-26 11:48:25 EDT
Build Identifier: 0.11.1

Need to create unified patches as it is possible with CVS.

Reproducible: Always

Steps to Reproduce:
1. Open a project
2. Right click > Team
3. "Create patch..." is missing compared to CVS.
Comment 1 Matthias Sohn CLA 2011-03-28 09:08:23 EDT
this is an enhancement request valid for all platforms
Comment 2 Dani Megert CLA 2011-08-23 12:15:21 EDT
Any plans to add this soon?
Comment 3 Thomas Schindl CLA 2011-09-21 09:46:50 EDT
not having this feature is at least for me a problem when I'd like to easily share a patch e.g. through bugzilla and is a clear functionality loss compared to other VCS. I'd be even willing to contribute this or is someoneelese already looking into it?
Comment 4 James Blackburn CLA 2011-09-21 10:34:48 EDT
Create patch isn't as straightforward in git as it is in CVS.  It begs the question of what your patch is against.  Often the user submitting the patch is on their own private feature branch, and what they really want is a patch containing the specified commit rebased against our branch...

See also bug 354800
Comment 5 Dani Megert CLA 2011-09-23 01:58:40 EDT
Not sure whether this is even possible with Git, but what I'm looking for is a simple way to put my outgoing (uncommitted) changes (across projects and across repositories) into a single patch file.
Comment 6 Markus Keller CLA 2011-09-23 06:04:30 EDT
http://wiki.eclipse.org/Platform-releng/Git_Workflows#Create_a_patch shows a workaround for creating a patch for changes from a single Git repository.

But what we really need is support for "workspace patches" as available from CVS. AFAIK, the Apply Patch wizard currently doesn't really care about the base version on which a patch was created. It just applies the patch to the workspace. So for a workspace patch, the base version should always be the origin's HEAD of the corresponding branch.

A workspace patch includes comments like this to tell the Apply Patch wizards about the target projects for the individual diffs (to support cross-repository patches):

### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core


This is a major regression for former CVS users.
Comment 7 Szymon Brandys CLA 2011-09-26 08:38:31 EDT
(In reply to comment #6)
> This is a major regression for former CVS users.

I agree. I think that the current bug severity may be misleading for EGit guys. This is probably the reason why no-one responded yet.
Comment 8 Szymon Brandys CLA 2011-11-03 05:49:54 EDT
Ping!
Comment 9 Tomasz Zarna CLA 2011-12-14 06:05:41 EST
I'm working on this.
Comment 10 Tomasz Zarna CLA 2011-12-14 10:05:45 EST
First cut: http://egit.eclipse.org/r/4816 , adding the action to the Team menu. No workspace patches yet, just git style diffs. Let me know what do you think by leaving a comment on the change.
Comment 11 Tomasz Zarna CLA 2011-12-14 10:34:42 EST
I'd love to use DiffCommand in the patch but I'm afraid bug 354919 had to be fixed first.
Comment 12 Tomasz Zarna CLA 2011-12-27 09:31:19 EST
*** Bug 361502 has been marked as a duplicate of this bug. ***
Comment 13 Tomasz Zarna CLA 2011-12-29 07:54:21 EST
(In reply to comment #11)
> I'd love to use DiffCommand in the patch

It's bug 367623.
Comment 14 Matthias Sohn CLA 2011-12-30 20:19:59 EST
http://egit.eclipse.org/r/#change,4816 merged as 3656b0aaf82c0aea5599fc957927c91e7cfe2602
Comment 15 Tomasz Zarna CLA 2012-01-03 05:28:56 EST
Marking as fixed, see comment above. Filed bug 367735 for adding "workspace patches" support.
Comment 16 Dani Megert CLA 2012-01-05 05:43:06 EST
Verified in 1.3.0.201201041914.

Filed bug 367928 for the missing mnemonic in the menu label.