[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-03-18 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Christopher Johnson christopher.john...@wikimedia.de changed:

   What|Removed |Added

 Status|RESOLVED|VERIFIED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-03-12 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

--- Comment #7 from Gerrit Notification Bot gerritad...@wikimedia.org ---
Change 110380 merged by jenkins-bot:
Check for conflicts in ChangeOpsMerge preSave

https://gerrit.wikimedia.org/r/110380

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-03-12 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

tobias.gritschac...@wikimedia.de changed:

   What|Removed |Added

 Status|PATCH_TO_REVIEW |RESOLVED
 CC||tobias.gritschacher@wikimed
   ||ia.de
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-03-11 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Lydia Pintscher lydia.pintsc...@wikimedia.de changed:

   What|Removed |Added

 Whiteboard|backlog u=dev c=backend p=8 |u=dev c=backend p=8

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-03-04 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Lydia Pintscher lydia.pintsc...@wikimedia.de changed:

   What|Removed |Added

 Whiteboard|backlog |backlog u=dev c=backend p=0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-03-04 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Lydia Pintscher lydia.pintsc...@wikimedia.de changed:

   What|Removed |Added

 Whiteboard|backlog u=dev c=backend p=0 |backlog u=dev c=backend p=8

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-01-30 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

--- Comment #6 from Gerrit Notification Bot gerritad...@wikimedia.org ---
Change 110380 had a related patch set uploaded by Addshore:
Check for Label/Description conflicts in ChangeOpsMerge

https://gerrit.wikimedia.org/r/110380

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-01-30 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Gerrit Notification Bot gerritad...@wikimedia.org changed:

   What|Removed |Added

 Status|NEW |PATCH_TO_REVIEW

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-01-24 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Addshore addshorew...@gmail.com changed:

   What|Removed |Added

 CC||pi...@hot.ee

--- Comment #5 from Addshore addshorew...@gmail.com ---
*** Bug 60390 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-01-06 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Gerrit Notification Bot gerritad...@wikimedia.org changed:

   What|Removed |Added

 Status|NEW |PATCH_TO_REVIEW

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-01-06 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

--- Comment #2 from Gerrit Notification Bot gerritad...@wikimedia.org ---
Change 105666 had a related patch set uploaded by Addshore:
Undo any edits if a Merge Fails!

https://gerrit.wikimedia.org/r/105666

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-01-06 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

--- Comment #3 from Gerrit Notification Bot gerritad...@wikimedia.org ---
Change 105666 abandoned by Addshore:
Undo any edits if a Merge Fails!

Reason:
per comment

https://gerrit.wikimedia.org/r/105666

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2014-01-06 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Addshore addshorew...@gmail.com changed:

   What|Removed |Added

 Status|PATCH_TO_REVIEW |NEW

--- Comment #4 from Addshore addshorew...@gmail.com ---
After further discussion with Hoo it turns out the failed merges are due to the
database having bad data in it already, i.e. two items that have the same label
and description.
Because of this we can not simply undo the edit as wikibase will not allow this
edit to happen.
Instead we should check that both edits will be possible before merging, this
might require some further refactoring of content handler classes

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2013-12-28 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Marius Hoch h...@online.de changed:

   What|Removed |Added

   Severity|normal  |major

--- Comment #1 from Marius Hoch h...@online.de ---
Problem is that we don't undo our changes to the first item (merge from) if the
second item (merge target) can't be saved. There's also a TODO about that in
the code //todo if the second result is not a success we should probably undo
the first change.

Solving that in a clean manner is hard, I guess... but this is actually causing
trouble in production.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2013-12-28 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Lydia Pintscher lydia.pintsc...@wikimedia.de changed:

   What|Removed |Added

 Whiteboard||backlog

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l


[Bug 55960] wbmergeitems api modules did not correctly merge Q7 and Q194

2013-10-21 Thread bugzilla-daemon
https://bugzilla.wikimedia.org/show_bug.cgi?id=55960

Lydia Pintscher lydia.pintsc...@wikimedia.de changed:

   What|Removed |Added

   Priority|Unprioritized   |High
 CC||lydia.pintscher@wikimedia.d
   ||e

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l