Importing old SVN project with git.
Forum rules
READ NOW: L2j Forums Rules of Conduct
READ NOW: L2j Forums Rules of Conduct
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Importing old SVN project with git.
So i have a backed up version of my old project wich is a few revs ahead the last stable sync. Is there a way to make it possible to update via git?
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: Importing old SVN project with git.
By back up you mean, local checkout or you the SVN itself?
If it's local, Team - Disconnect - Delete SVN data, then Team - Share - Git, then configure upstream to be L2J, finally make a rebase, you may want to google about it.
If it's local, Team - Disconnect - Delete SVN data, then Team - Share - Git, then configure upstream to be L2J, finally make a rebase, you may want to google about it.
Powered by Eclipse 4.30 | Eclipse Temurin 21 | MariaDB 11.2.2 | L2J Server 2.6.3.0 - High Five
Join our Discord!
Join our Discord!
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: Importing old SVN project with git.
I had it saved as a zip file. So i had to import it into the eclipse and i dont get these options on the team section.
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: Importing old SVN project with git.
Make sure you have the proper Eclipse version, 4.4.1+
Powered by Eclipse 4.30 | Eclipse Temurin 21 | MariaDB 11.2.2 | L2J Server 2.6.3.0 - High Five
Join our Discord!
Join our Discord!
- Battlecruiser
- L2j Veteran
- Posts: 332
- Joined: Thu May 01, 2008 9:44 am
Re: Importing old SVN project with git.
checkout latest version in SVN from git, unpack your state, commit, then pull
Git user
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: Importing old SVN project with git.
Got some questions (i know its necroposting).
So lets say i clone the master from git, i apply my changes and then i press commit. Do the changes i made get commited in my local repository?
So lets say i clone the master from git, i apply my changes and then i press commit. Do the changes i made get commited in my local repository?
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: Importing old SVN project with git.
If you do commit yes it's local repository, if you do commit and push it will try to commit to origin as well.JMD wrote:Got some questions (i know its necroposting).
So lets say i clone the master from git, i apply my changes and then i press commit. Do the changes i made get commited in my local repository?
Powered by Eclipse 4.30 | Eclipse Temurin 21 | MariaDB 11.2.2 | L2J Server 2.6.3.0 - High Five
Join our Discord!
Join our Discord!
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: Importing old SVN project with git.
so in svn terms
push=commit to original repo or your own fork (if you use a fork you made of the original pack)
pull= update (to head? or it will trigger the sync view in case of conflict?)
push=commit to original repo or your own fork (if you use a fork you made of the original pack)
pull= update (to head? or it will trigger the sync view in case of conflict?)
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: Importing old SVN project with git.
This are different things and you shouldn't see them as SVN, but just to follow your POV, push = commit and pull is update to head with conflicts.JMD wrote:so in svn terms
push=commit to original repo or your own fork (if you use a fork you made of the original pack)
pull= update (to head? or it will trigger the sync view in case of conflict?)
Powered by Eclipse 4.30 | Eclipse Temurin 21 | MariaDB 11.2.2 | L2J Server 2.6.3.0 - High Five
Join our Discord!
Join our Discord!
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: Importing old SVN project with git.
I see. thanks.