mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/referencesource/System.Data.Linq/ChangeConflicts.cs
View File

@ -279,7 +279,7 @@ namespace System.Data.Linq {
private void ResolveDelete() {
Debug.Assert(this.IsDeleted);
// If the user is attempting to update an entity that no longer exists
// in the database, we first need to [....] the delete into the local cache.
// in the database, we first need to sync the delete into the local cache.
if (!trackedObject.IsDeleted) {
trackedObject.ConvertToDeleted();
}
@ -287,7 +287,7 @@ namespace System.Data.Linq {
// As the object have been deleted, it needs to leave the cache
this.Session.Context.Services.RemoveCachedObjectLike(trackedObject.Type, trackedObject.Original);
// Now that our cache is in [....], we accept the changes
// Now that our cache is in sync, we accept the changes
this.trackedObject.AcceptChanges();
this.isResolved = true;
}