{"thread":{"id":"32059","subject":"old folders returning","startedAt":"2012-11-10T17:30:15Z","lastAt":"2012-11-10T17:41:51Z","messageCount":2,"participants":["David Coombes","Andy Hawkins"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"202763","messageId":"CAN4PrMavggqn3ZM1atde5CADjszzLOvPoQasjRZfUvRKrqS-uA@mail.gmail.com","threadId":"32059","inReplyTo":null,"subject":"old folders returning","fromName":"David Coombes","fromEmail":"webeire@gmail.com","sentAt":"2012-11-10T17:30:15Z","receivedAt":"2012-11-10T17:30:15Z","isPatch":false,"sender":{"key":"webeire@gmail.com","avatar":null},"body":"Issue:\n--------\nI renamed a deprecated folder that i needed the code for, added \".old\"\nto name. I then pushed to the repository and the original folder and\nthe newly renamed are now in the repository and on my local branch.\n\nI renamed 'autoflow' to 'autoflow.old' and worked away ok. But after\nthe push I now have both of the folders with duplicate files.\n\nThe 'autoflow' folder that has appeared is also from an earlier push\nthis morning 1038 its now 1727\n\nRe-Create:\n----------------\nNo idea how to as its the first time I've seen this. But the output\nfrom the push is:\n git push origin autoflow\nCounting objects: 267, done.\nDelta compression using up to 4 threads.\nCompressing objects: 100% (132/132), done.\nWriting objects: 100% (146/146), 140.69 KiB, done.\nTotal 146 (delta 76), reused 1 (delta 0)\nTo git@github.com:cityindex/labs.cityindex.com.git\n   8ea3cd9..7e6ff4f  autoflow -> autoflow\n\nCause:\n----------\nThe only suggestion I can think of is that the name wasn't cleared\nafter the \"git add *\" and then git went looking for an earlier copy.\nBut seems the issue is with the git client as well because of the\nmodified time. If it were pulled then the modified time would've\nchanged, so it must have been taken from an earlier commit on my local\nbranch.\n\nSystem:\n------------\n$ git --version\ngit version 1.7.9.5\n\n$ cat /etc/*release*\nDISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=12.04\nDISTRIB_CODENAME=precise\nDISTRIB_DESCRIPTION=\"Ubuntu 12.04.1 LTS\"\n\n$ uname -a\nLinux daithi-laptop 3.2.0-32-generic #51-Ubuntu SMP Wed Sep 26\n21:33:09 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux\n\n--\n\"Any society that would give up a little liberty to gain a little security,\n               will deserve neither and lose both.\" - Benjamin Franklin\n"},{"id":"202764","messageId":"slrnk9t4ev.qhg.andy@atom.gently.org.uk","threadId":"32059","inReplyTo":"CAN4PrMavggqn3ZM1atde5CADjszzLOvPoQasjRZfUvRKrqS-uA@mail.gmail.com","subject":"Re: old folders returning","fromName":"Andy Hawkins","fromEmail":"andy@gently.org.uk","sentAt":"2012-11-10T17:41:51Z","receivedAt":"2012-11-10T17:41:51Z","isPatch":false,"sender":{"key":"andy@gently.org.uk","avatar":"https://gravatar.com/avatar/bb1d693cf46a3f8239641ec627f5e49b2028cdf9ede886791902cdac058816cd?d=mp&s=160"},"body":"Hi,\n\nIn article <CAN4PrMavggqn3ZM1atde5CADjszzLOvPoQasjRZfUvRKrqS-uA@mail.gmail.com>,\n           David Coombes<webeire@gmail.com> wrote:\n> The only suggestion I can think of is that the name wasn't cleared\n> after the \"git add *\" and then git went looking for an earlier copy.\n> But seems the issue is with the git client as well because of the\n> modified time. If it were pulled then the modified time would've\n> changed, so it must have been taken from an earlier commit on my local\n> branch.\n\nDid you git rm the 'old' name of the folder?\n\nAndy\n"}]}