Commit Graph

5 Commits

Author SHA1 Message Date
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Dan Oconnor
be25e93db6 #ue4 modificatiosn to source control plugins to better handle files that are in a conflicted state, or are not at head and are going to enter a conflicted state when we sync
#codereview Thomas.Sarkanen

[CL 2111945 by Dan Oconnor in Main branch]
2014-06-20 12:57:45 -04:00
Thomas Sarkanen
06466ce255 Added CanCheckIn() to ISourceControlProvider
To allow for further abstraction & extension using DVCS systems like Git & Mercurial, we expose a new CanCheckIn() function that is used when determing 'modifed' files to check in.

#github https://github.com/EpicGames/UnrealEngine/pull/151

TTP# 335099 - [GitHub] 151 : Add ISourceControlState::CanCheckIn()

reviewed by Max.Preussner

[CL 2073950 by Thomas Sarkanen in Main branch]
2014-05-15 04:14:04 -04:00
Thomas Sarkanen
c9179dae1f #summary Prevented engine content from appearing in "Submit To Source Control..." dialog when it shouldnt.
#ttp 331118 	LIVE: Editor: Source Control: Engine content is displayed in Check In dialog
#add 	Added a CanAdd() function to the source control state API & implemented this for both providers.
#change 	Changed asset context menu to restrict operations that can be performed based on the new information provided by CanAdd().
#fix 	Fixed a terrible bug in the SVN provider where only the first batch of 50 files would have their status returned correctly.
reviewed by 	Andrew.Brown

[CL 2043041 by Thomas Sarkanen in Main branch]
2014-04-23 18:13:09 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00