DESCRIPTION

Added 'Replace With HEAD' menu option

Bug: 326638
Change-Id: I859d5c0ff40aadacd017c39fcc03437571f00216
Signed-off-by: Carla Osborn <Isabella xxx@xxx.xxx


COMMENTS

author: Carla Osborn
date: 2011-02-07 15:27:09.000000000

Uploaded patch set 2.

-------------------------------------
author: Willow Cantrell
date: 2011-02-15 15:59:37.000000000

Patch Set 2: I would prefer that you didn't submit this

I did this for a project that was shared but had some untracked files (.classpath was the actual offender here) and got the Exception below (the TreeWalk is null as the file under the path is not tracked).

java.lang.NullPointerException
	at org.eclipse.egit.core.op.ReplaceFromHEADOperation.discardChange(ReplaceFromHEADOperation.java:52)
	at org.eclipse.egit.core.op.DiscardChangesOperation.discardChanges(DiscardChangesOperation.java:114)
	at org.eclipse.egit.core.op.DiscardChangesOperation.access$0(DiscardChangesOperation.java:98)
	at org.eclipse.egit.core.op.DiscardChangesOperation$1.run(DiscardChangesOperation.java:91)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1800)
	at org.eclipse.egit.core.op.DiscardChangesOperation.execute(DiscardChangesOperation.java:94)
	at org.eclipse.egit.ui.internal.actions.DiscardChangesActionHandler$1.run(DiscardChangesActionHandler.java:85)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)

-------------------------------------
