{"id":2557,"date":"2009-01-20T23:55:35","date_gmt":"2009-01-20T21:55:35","guid":{"rendered":"http:\/\/vasil.ludost.net\/blog\/?p=2557"},"modified":"2009-01-20T23:55:35","modified_gmt":"2009-01-20T21:55:35","slug":"2009-01-20-merge-2","status":"publish","type":"post","link":"https:\/\/vasil.ludost.net\/blog\/?p=2557","title":{"rendered":"2009-01-20 merge"},"content":{"rendered":"<p>Today was one of the days, in which I kept thinking &#8220;why the hell am I still sober at work&#8221;&#8230;<\/p>\n<p>One of the sites we have is being worked on again, so I had to check on it. Turned out that there was a tremendous difference between it ant what we had in the version control, and the mess was really high-class. The merging took 3-4 hours &#8211; looking at what has to be cleaned up, what to be ignored, what to go under versioning, if there&#8217;s a file full replaced just because of change from unix to dos newlines and other similar crap. I also found out what heights the programmers can reach without version control &#8211; in a directory I found the following variations of one file:<\/p>\n<pre>\r\nindex_111.php\r\nindex111.php\r\nindex_11.php\r\nindex123.php\r\nindex12.php\r\nindex_1_.php\r\nindex_1.php\r\nindex2.php\r\nindexcopy.php\r\nindex_current.php\r\nindex_last.php\r\nindexnow2.php\r\nindex_old1.php\r\nindex_old2.php\r\nindex_old.php\r\nindex_OLD.php\r\nindex_oold.php\r\n_index.php\r\nindex____.php\r\nindex___.php\r\nindex__.php\r\nindex_.php\r\nindexshot.php\r\nindexxx.php\r\n<\/pre>\n<p>Long live the ingenuity and lack of rational thought.<\/p>\n<p>And to top this, not all ignores are in place yet (so svn status says that some files from some caches are weird, but at least they have never been committed). In the end the whole thing is about 700MB, 5800 files and svn status takes 11 seconds on the second run &#8230;<br \/>\n(then some people wonder why do I say that programmers aren&#8217;t human)<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Today was one of the days, in which I kept thinking &#8220;why the hell am I still sober at work&#8221;&#8230; One of the sites we have is being worked on again, so I had to check on it. Turned out that there was a tremendous difference between it ant what we had in the version [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-2557","post","type-post","status-publish","format-standard","hentry","category-general"],"_links":{"self":[{"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2557","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=2557"}],"version-history":[{"count":0,"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2557\/revisions"}],"wp:attachment":[{"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=2557"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=2557"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/vasil.ludost.net\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=2557"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}