* "Resetting" a repository
@ 2011-09-27 15:24 gitlist
2011-09-27 16:22 ` Randal L. Schwartz
0 siblings, 1 reply; 3+ messages in thread
From: gitlist @ 2011-09-27 15:24 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: "Resetting" a repository
2011-09-27 15:24 "Resetting" a repository gitlist
@ 2011-09-27 16:22 ` Randal L. Schwartz
2011-09-28 7:52 ` Roddie Grant
0 siblings, 1 reply; 3+ messages in thread
From: Randal L. Schwartz @ 2011-09-27 16:22 UTC (permalink / raw)
To: gitlist; +Cc: git
>>>>> "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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: "Resetting" a repository
2011-09-27 16:22 ` Randal L. Schwartz
@ 2011-09-28 7:52 ` Roddie Grant
0 siblings, 0 replies; 3+ messages in thread
From: Roddie Grant @ 2011-09-28 7:52 UTC (permalink / raw)
To: git
On 27/09/2011 17:22, Randal L. Schwartz wrote:
>>>>>> "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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-28 7:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-27 15:24 "Resetting" a repository gitlist
2011-09-27 16:22 ` Randal L. Schwartz
2011-09-28 7:52 ` Roddie Grant
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox