RE: Can I retrospectively merge an old Git repo with a new one ?

You are quite right, I got the wrong list. This obviously a TortoiseGit issue (not Svn). I got my tortoises mixed up…

I realized shortly after I sent my query, but I've been having mailer problems so my attempt to acknowledge my error disappeared into the ether somewhere (twice).

I'll re-post on the Git or TortoiseGit lists. And I'll try to be a bit clearer about how I got to where I am. I am quite familiar with Client-Server Version Control systems (CVS and Subversion) but am quite new to Git so had started out without a separate server, but had made a couple of full copies of a project. I'll explain more in a more suitable forum.

Apologies for the noise,
Regards,
Richard.

Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice
T: +44 (0)20 3618 2669
M: +44 (0)7812 325518
4 Triton Square, Regent’s Place, London NW1 3HG
richard.kerry_at_atos.net

This e-mail and the documents attached are confidential and intended solely for the addressee; it may also be privileged. If you receive this e-mail in error, please notify the sender immediately and destroy it. As its integrity cannot be secured on the Internet, the Atos group liability cannot be triggered for the message content. Although the sender endeavours to maintain a computer virus-free network, the sender does not warrant that this transmission is virus-free and will not be liable for any damages resulting from any virus transmitted.

________________________________________
From: Gavin Lambert [tsvn_at_mirality.co.nz]
Sent: 23 March 2017 04:57
To: users_at_tortoisesvn.tigris.org
Subject: Re: Can I retrospectively merge an old Git repo with a new one ?

On 22/03/2017 04:41, Kerry, Richard wrote:
> I have just recently tried to change a Git project (ie repo) into a
> server. To get started with this, as it’s the first one I’ve done, I’m
> using the local protocol, ie the new repo is a file folder, cloned from
> the existing project using “clone into bare repo”.

This is the TortoiseSVN forum -- if you're asking Git questions you
should probably do so elsewhere.

But: if you have a local Git repo that contains history and you want to
upload it to a remote Git server (eg. GitHub), then you simply need to
create a blank repository using the server-side tools (eg. create a new
repository on GitHub), add this as a remote to your existing repository,
and then push. This will upload all the commit history to the server.

> This project has a bit of history, but up to now I’ve just made copies
> of the whole project folder and copied that around to work on. I’d like
> now to point those existing copied projects at my new, cloned, bare repo
> version. Can I do that ? Or do I need to check-out/clone it and start
> again and manually merge existing files ?

This sounds like you haven't actually been using the version control
properly, so it's unclear what you meant above.

Did you start by cloning someone else's Git repo and have been making
local changes just by copying the folder? Or did you create an empty
local repo and commited some changes to it before stopping and making
copies instead? Or have you been making a mix of copies and commits?

Do you care about retaining the history of this project or are you only
interested in preserving the current and future states?

Either way, you've made a mess for yourself, but it can be cleaned up;
we just need to work out what state things are starting in and how much
of the history you want to preserve. (And whether you really are
talking about Git or SVN.)

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3222076

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Atos, Atos Consulting, Worldline and Canopy The Open Cloud Company are trading names used by the Atos group. The following trading entities are registered in England and Wales: Atos IT Services UK Limited (registered number 01245534), Atos Consulting Limited (registered number 04312380), Atos Worldline UK Limited (registered number 08514184) and Canopy The Open Cloud Company Limited (registration number 08011902). The registered office for each is at 4 Triton Square, Regent’s Place, London, NW1 3HG.The VAT No. for each is: GB232327983.

This e-mail and the documents attached are confidential and intended solely for the addressee, and may contain confidential or privileged information. If you receive this e-mail in error, you are not authorised to copy, disclose, use or retain it. Please notify the sender immediately and delete this email from your systems. As emails may be intercepted, amended or lost, they are not secure. Atos therefore can accept no liability for any errors or their content. Although Atos endeavours to maintain a virus-free network, we do not warrant that this transmission is virus-free and can accept no liability for any damages resulting from any virus transmitted. The risks are deemed to be accepted by everyone who communicates with Atos by email.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3223365

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-03-27 11:43:52 CEST