 Bryan Housel
|
4c6b75a868
|
In mergeChildren(), not a conflict if child versions same
|
2015-07-17 10:02:21 -04:00 |
|
|
Bryan Housel
|
ca47d2662d
|
Let conflict resolution restore deleted childnodes if force_local
|
2015-06-18 11:48:49 -04:00 |
|
|
Bryan Housel
|
8eae273bde
|
Correctly restore new local childnodes when choosing "keep local"
|
2015-04-30 14:10:32 -04:00 |
|
|
Bryan Housel
|
c503b9f96c
|
fill remoteGraph with loadMultiple, finally do proper undeletion
|
2015-03-03 23:43:37 -05:00 |
|
|
Bryan Housel
|
edda24360a
|
Fix undeletion version, don't undelete twice
|
2015-03-03 20:51:33 -05:00 |
|
|
Bryan Housel
|
38f833d19c
|
Exclude current way when checking if childnode is used
|
2015-03-02 22:47:13 -05:00 |
|
|
Bryan Housel
|
e3139e250e
|
improvements to iD.actions.MergeRemoteChanges
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
|
2015-03-02 13:07:24 -05:00 |
|
|
Bryan Housel
|
78ca4b11f4
|
Better support for delete/restore
|
2015-02-28 23:03:44 -05:00 |
|
|
Bryan Housel
|
2b3dfef5e7
|
Fix versions of childnodes when merging force_local
|
2015-02-27 16:56:00 -05:00 |
|
|
Bryan Housel
|
72e5c3dce1
|
remove/restore of child vertices when switching mine/theirs
|
2015-02-21 00:02:46 -05:00 |
|
|
Bryan Housel
|
0730e0432b
|
keep localGraph - UI can now flip between mine/theirs
|
2015-02-20 17:01:19 -05:00 |
|
|
Bryan Housel
|
ad8c381301
|
WIP: handle conflicting local tag deletion
re: https://github.com/openstreetmap/iD/pull/2489#discussion-diff-22490581
|
2015-02-20 12:43:47 -05:00 |
|
|
Bryan Housel
|
0a1dd4b338
|
WIP: simplify
|
2015-02-20 11:21:47 -05:00 |
|
|
Bryan Housel
|
38b50a347e
|
WIP: Fix tests, simplify mergeChildNodes
|
2015-02-17 22:10:47 -05:00 |
|
|
Bryan Housel
|
ebe5484e22
|
WIP: MergeRemoteChanges merges way childnodes
|
2015-02-17 00:51:49 -05:00 |
|
|
Bryan Housel
|
d755145ae6
|
WIP: usernames in messages, show # of total
|
2015-02-14 11:20:19 -05:00 |
|
|
Bryan Housel
|
0e35a6b35b
|
Don't ignore tiger: tags in mergeTags
|
2015-01-07 11:56:46 -05:00 |
|
|
Bryan Housel
|
b2ad17f1cb
|
code style
|
2015-01-07 11:13:54 -05:00 |
|
|
Bryan Housel
|
3bbf31902a
|
Add accessor to get conflict details from iD.actions.MergeRemoteChanges
|
2014-12-29 22:47:44 -05:00 |
|
|
Bryan Housel
|
0c881ef9f2
|
merge ways with non-overlapping changes to nodelists
|
2014-12-13 22:50:29 -05:00 |
|
|
Bryan Housel
|
977e29cfdb
|
Most iD.actions.MergeRemoteChanges features complete
(todo: merging ways where nodelist has not been reordered)
|
2014-12-11 23:52:53 -05:00 |
|
|
Bryan Housel
|
dc1221b8ba
|
pass graphs instead of entities to iD.actions.MergeRemoteChanges
(realized that I will need to compare more stuff from the
local and remote graphs in order to merge ways/relations)
|
2014-12-10 00:12:32 -05:00 |
|
|
Bryan Housel
|
5aa95d4dd4
|
iD.actions.MergeRemoteChanges merges remote tags
|
2014-12-09 00:58:36 -05:00 |
|
|
Bryan Housel
|
3e97bd7d89
|
stub out iD.actions.MergeRemoteChanges
|
2014-12-06 22:11:54 -05:00 |
|