Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 362907 - Allow to replace current state with state from a History entry
Summary: Allow to replace current state with state from a History entry
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.2   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 5.4   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 546193 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-11-04 09:59 EDT by Dani Megert CLA
Modified: 2019-06-11 04:17 EDT (History)
5 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dani Megert CLA 2011-11-04 09:59:29 EDT 
1.2.

I can open and compare the a history entry with the current state but there's no easy way to replace the current state/file with the history state. Ideally this would be offered on the history entry plus on each file.
Comment 1 Matthias Sohn CLA 2012-06-04 02:12:28 EDT 
This is possible in 2.0 on any resource's team menu, click "Replace With > Commit...". 

"Replace with" menus could be also added on files in the History View's file list. I'm not sure what you would like to do when calling "Replace with" on a commit selected in the History View.
Comment 2 Dani Megert CLA 2012-07-02 07:30:31 EDT 
(In reply to comment #1)
> This is possible in 2.0 on any resource's team menu, click "Replace With >
> Commit...". 
> 
> "Replace with" menus could be also added on files in the History View's file
> list. I'm not sure what you would like to do when calling "Replace with" on a
> commit selected in the History View.

Assume the commit has 50 files. Instead of replacing each file individually I'd like to do it once on the commit.
Comment 3 Eclipse Genie CLA 2019-05-17 17:11:35 EDT 
New Gerrit change created: https://git.eclipse.org/r/142357
Comment 4 Lars Vogel CLA 2019-05-20 03:06:58 EDT 
Definitely a feature I desire for a very long time.
Comment 5 Eclipse Genie CLA 2019-05-22 04:37:53 EDT 
Gerrit change https://git.eclipse.org/r/142357 was merged to [master].
Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=e8ef6ff1e1044c8dc3b3443bd37f34873c6c7de0
Comment 6 Thomas Wolf CLA 2019-05-22 05:52:57 EDT 
(In reply to Eclipse Genie from comment #5)
> Gerrit change https://git.eclipse.org/r/142357 was merged to [master].
> Commit:
> http://git.eclipse.org/c/egit/egit.git/commit/
> ?id=e8ef6ff1e1044c8dc3b3443bd37f34873c6c7de0

This provides a "Check Out This Version" context menu action to check out a particular file version from a commit.

It's available in the Git History page (list of changed files bottom right), and also in the file lists in the Commit Viewer (also for stashes), and also in the outline page of the Commit Viewer's unified diff page.

The functionality of comment 2 (providing an operation in the commit table of the history view to check out _all_ files touched by commit from that commit) is not implemented. It is available on a particular commit by selecting all files in the list of changed files bottom right and using the new operation there.
Comment 7 Lars Vogel CLA 2019-06-11 04:17:45 EDT 
*** Bug 546193 has been marked as a duplicate of this bug. ***