threads / discuss / 28511

"Resetting" a repository

Subject: "Resetting" a repository

## tl;dr

3 messages between Sep 27, 2011 and Sep 28, 2011.

replies: 2people: 2as markdown or json

gitlist· Sep 27, 2011, 15:24 UTC · lore

I have a project with a test repository and a live repository (and a development repository).

Over time, the test repository has had merges which were in a quite different order to the live repository, so it no longer fulfills its role of being pretty much like the live repository and therefore a good place to test. The two have diverged too far.

We've reached a point in the project when it would be good to reset the test repository so that it is exactly the same as the live one. We can then merge new work from the development repository.

I think that if I just merge the live repository into the test respository it will not remove extra (non-conflicting) code. On this occasion I want to remove all extra code and resolve all conflicts in favour of the live repository version.

I'd appreciate advice on the best way to do this.

Thanks

Roddie Grant

Randal L. Schwartz· Sep 27, 2011, 16:22 UTC · re: gitlist · lore

Re: "Resetting" a repository

>>>>> "gitlist" == gitlist  <gitlist@myword.co.uk> writes:

gitlist> I have a project with a test repository and a live repository (and a gitlist> development repository).

You haven't mentioned what kind of access you have to the two repos. Are they both bare remote repos? Or can you just rsync one over the other?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.posterous.com/ for Smalltalk discussion

Roddie Grant· Sep 28, 2011, 07:52 UTC · re: Randal L. Schwartz · lore

Re: "Resetting" a repository

On 27/09/2011 17:22, Randal L. Schwartz wrote:

Show 8 quoted lines

>>>>>> "gitlist" == gitlist<gitlist@myword.co.uk>  writes:
>
> gitlist>  I have a project with a test repository and a live repository (and a
> gitlist>  development repository).
>
> You haven't mentioned what kind of access you have to the two repos.
> Are they both bare remote repos?  Or can you just rsync one over the
> other?

Both repos are on the same virtual server. I normally use ssh for git, but have full access to the server. Both repos are not bare. The test repos is for the customer to test new stuff and the live repos is for the world to see the site (it's all for a website).

The development repos is on my laptop, but it's the test and live repos I want to get back in step with each other.

Thanks

Roddie Grant