{"thread":{"id":"28511","subject":"\"Resetting\" a repository","startedAt":"2011-09-27T15:24:23Z","lastAt":"2011-09-28T07:52:28Z","messageCount":3,"participants":["gitlist","Randal L. Schwartz","Roddie Grant"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"176335","messageId":"4E81EAA7.5030708@myword.co.uk","threadId":"28511","inReplyTo":null,"subject":"\"Resetting\" a repository","fromName":"gitlist","fromEmail":"gitlist@myword.co.uk","sentAt":"2011-09-27T15:24:23Z","receivedAt":"2011-09-27T15:24:23Z","isPatch":false,"sender":{"key":"gitlist@myword.co.uk","avatar":null},"body":"I have a project with a test repository and a live repository (and a \ndevelopment repository).\n\nOver time, the test repository has had merges which were in a quite \ndifferent order to the live repository, so it no longer fulfills its \nrole of being pretty much like the live repository and therefore a good \nplace to test. The two have diverged too far.\n\nWe've reached a point in the project when it would be good to reset the \ntest repository so that it is exactly the same as the live one. We can \nthen merge new work from the development repository.\n\nI think that if I just merge the live repository into the test \nrespository it will not remove extra (non-conflicting) code. On this \noccasion I want to remove all extra code and resolve all conflicts in \nfavour of the live repository version.\n\nI'd appreciate advice on the best way to do this.\n\nThanks\n\nRoddie Grant\n"},{"id":"176341","messageId":"861uv27y6k.fsf@red.stonehenge.com","threadId":"28511","inReplyTo":"4E81EAA7.5030708@myword.co.uk","subject":"Re: \"Resetting\" a repository","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2011-09-27T16:22:11Z","receivedAt":"2011-09-27T16:22:11Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"gitlist\" == gitlist  <gitlist@myword.co.uk> writes:\n\ngitlist> I have a project with a test repository and a live repository (and a\ngitlist> development repository).\n\nYou haven't mentioned what kind of access you have to the two repos.\nAre they both bare remote repos?  Or can you just rsync one over the\nother?\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>\nSmalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.\nSee http://methodsandmessages.posterous.com/ for Smalltalk discussion\n"},{"id":"176389","messageId":"4E82D23C.4020400@myword.co.uk","threadId":"28511","inReplyTo":"861uv27y6k.fsf@red.stonehenge.com","subject":"Re: \"Resetting\" a repository","fromName":"Roddie Grant","fromEmail":"gitlist@myword.co.uk","sentAt":"2011-09-28T07:52:28Z","receivedAt":"2011-09-28T07:52:28Z","isPatch":false,"sender":{"key":"gitlist@myword.co.uk","avatar":null},"body":"On 27/09/2011 17:22, Randal L. Schwartz wrote:\n>>>>>> \"gitlist\" == gitlist<gitlist@myword.co.uk>  writes:\n>\n> gitlist>  I have a project with a test repository and a live repository (and a\n> gitlist>  development repository).\n>\n> You haven't mentioned what kind of access you have to the two repos.\n> Are they both bare remote repos?  Or can you just rsync one over the\n> other?\n\nBoth repos are on the same virtual server. I normally use ssh for git, \nbut have full access to the server. Both repos are not bare. The test \nrepos is for the customer to test new stuff and the live repos is for \nthe world to see the site (it's all for a website).\n\nThe development repos is on my laptop, but it's the test and live repos \nI want to get back in step with each other.\n\nThanks\n\nRoddie Grant\n"}]}