search

sii / siptrackd

Other
0 stars 4 forks source link

WARNING: Issue with eventlog-2 branch #15

Closed stemid closed 5 years ago

stemid commented 5 years ago

It appears that when merging master into eventlog-2, after basing eventlog-2 on eventlog branch, I made some mistakes with the merge conflicts.

One example of this is in siptrackd_twisted/attribute.py in Attribute.xmlrpc_set_value. Compare the file from eventlog-2, with the file from master.

You'll see that the code in master is simpler, cleaner and more modern I assume.

So the eventlog branch was so old that it did not incorporate all these modernizations @sii hade made. And when I merged master into eventlog-2 to update it I missed this.

So I'm writing this issue as a warning for myself and others when it's time to merge eventlog-2 into master we need to be very careful about resolving merge conflicts correctly.

I would recommend doing the merge locally, not through github. And going through every merged file, comparing them to the current remote master branch on github. So we don't overwrite anything with old code.

stemid commented 5 years ago

This was blown slightly out of proportion, closing now that I've fixed the _set_value thing in 7a70105.