Eclipse Community Forums: EGit

Help

Home

Home » Eclipse Projects » EGit » Stash Apply

Show: Today's Messages :: Show Polls :: Message Navigator

Stash Apply [message #1007914]

Fri, 08 February 2013 02:57

Jan Hoskens
Messages: 5
Registered: January 2013

Junior Member

Hi,

I just noticed that applying the stash in EGit reacts differently than the command line. Say I have an incoming file A which conflicts with my unstaged file A. I stash my file A, rebase and re-apply the stash. I now got file A in staged form which has an undo of the incoming changes and a file A in unstaged form which applies my stash changes. The command line however correctly has a conflict with both changes.

Am I missing something or is this a bug?

The more I work with EGit the more I get the feeling that this plugin is not really production ready. Are there really people working with this plugin on a reasonable sized project? Or is there another eclipse plugin that is more mature than this?

Kind Regards,
Jan

Report message to a moderator

Re: Stash Apply [message #1007934 is a reply to message #1007914]

Fri, 08 February 2013 04:59

Matthias Sohn
Messages: 395
Registered: July 2009

Senior Member

This was fixed recently [1], try a recent nightly build which you may install from [2].
The fix will be contained in the upcoming 2.3 release which will be shipped on Feb 22.

[1] https://git.eclipse.org/r/#/c/9877/
[2] http://download.eclipse.org/egit/updates-nightly

Report message to a moderator

Re: Stash Apply [message #1007946 is a reply to message #1007934]

Fri, 08 February 2013 06:21

Jan Hoskens
Messages: 5
Registered: January 2013

Junior Member

Thanks for the quick reply!

Just installed the nightly and it looks OK now.

Was just wondering if the rename conflict problem is targeted for 2.3 as well. Or is it still pending?

Report message to a moderator

Re: Stash Apply [message #1014917 is a reply to message #1007914]

Tue, 26 February 2013 13:36

Abby Bader
Messages: 3
Registered: February 2013

Junior Member

Here's a stash-related observation:

Stash-pull-apply is a common and important workflow for git users.

I only discovered recently that eGit allows you to view stashes in the commit viewer, after months of using the plugin. This is a great feature, but it's completely hidden from users.

As in - you have to know to double-click the stash to view it, and viewing it is not an option when you right-click a stash. I'd suggest including "view stash in commit viewer" as an option in the right-click menu.

Report message to a moderator

Re: Stash Apply [message #1016066 is a reply to message #1007914]

Mon, 04 March 2013 14:20

Robin Rosenberg
Messages: 268
Registered: July 2009

Senior Member

Jan Hoskens skrev 2013-02-08 08.57:
> Hi,
>
> I just noticed that applying the stash in EGit reacts differently than the command line. Say I have an incoming file A which conflicts with my unstaged file A. I stash my
> file A, rebase and re-apply the stash. I now got file A in staged form which has an undo of the incoming changes and a file A in unstaged form which applies my stash
> changes. The command line however correctly has a conflict with both changes.
> Am I missing something or is this a bug?

Bug. Hopefully I fixed that in 2.3.1

-- robin

Report message to a moderator

Previous Topic:	How to list files affected in a commit ?[SOLVED]
Next Topic:	NPE when using MergeCommand and StrategySimpleTwoWayInCore with conflicting commits

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Sat May 25 17:54:45 EDT 2013