Context Navigation

Changes between Version 1 and Version 2 of Ticket #8509, comment 29

v1	v2
16	16	It's just a rough draft, it might not be feasible to do, but it seems this has not been thought about in above discussion (or maybe I've overlooked, sorry in this case).
17	17
18		If the server does not accept the changeset, this might produce additional complexity though: A conflict object produced as a result of a failed upload might be difficult to merge to the active dataset if it involves primitives that have been changed ("conflict hitting conflict" case). In this case it may be better to not try to merge the dataset with the failed upload, but to issue UpdateData on the active layer instead and simply warn the user that the upload attempt failed. I.e. the merge od duplicate and active layer dataset should only be necessary, if the upload succeeded. So it may be harder to code than the locking approach, I suppose.
	18	If the server does not accept the changeset, this might produce additional complexity though: A conflict object produced as a result of a failed upload might be difficult to merge to the active dataset if it involves primitives that have been changed ("conflict hitting conflict" case). In this case it may be better to not try to merge the dataset with the failed upload, but to issue UpdateData on the active layer instead and simply warn the user that the upload attempt failed. I.e. the merge of duplicate and active layer dataset should only be necessary, if the upload succeeded. So it may be harder to code than the locking approach, I suppose.