Development > Newbie Coding

Switch from svn to git without redownloading everything?

<< < (7/13) > >>

Mattn:
just stash them away (a simple script like:)


--- Code: ---#!/bin/sh
cd /path/to/ufoai
git fetch
git stash save
git upbase
git stash pop

--- End code ---

Mattn:
@duke: about working on single bugs - there is nothing wrong in doing one local branch for each bug. switching branches, merging branches - stuff like that is a lot faster and more advanced compared to svn.

the problem with .cproject and .project is not related to stashing. you would have the same problem when doing svn up - a merge conflict is a merge conflict. we have to think about a solution for these files - but for this we have to get eclipse + mingw working for windows first (which i'm still working on btw)

H-Hour:

--- Quote from: Kildor on October 01, 2010, 05:43:51 am ---* Unfinished maps that I don`t want to share yet (is not enough quality).
--- End quote ---

These shouldn't create any problems as long as you haven't comitted them locally. I also have unfinished maps in the directory.


--- Quote ---* Some playing with ump (again unfinished).
--- End quote ---

Yeah, this will cause a problem. You could rename the file to "(mapname)_test.ump" and then add a new .ufo file that points to (mapname)_test, so you have both the trunk and the modified version as options in skirmish.


--- Quote ---* normal version of compile_maps.bat (I hate current version of it).
--- End quote ---

I just renamed mine to compile_maps_old.bat and I run that instead when I need it.

geever:

--- Quote from: Kildor on October 01, 2010, 05:43:51 am ---> btw. which changes are needed in your local copy but should not get commited? something build related?
* Unfinished maps that I don`t want to share yet (is not enough quality).
* Some playing with ump (again unfinished).
* normal version of compile_maps.bat (I hate current version of it).
* some others tests, playings and so on.

--- End quote ---

My oppinion is: you should create local branches for these and commit on top of them.

-geever

dodon:
I have not worked with Git (yet)

But I hope to get rid of all my unversioned files and changes. These things should go into a local branch.

@duke: as Mattn proposed one local branch per bug seems appropriate.

Navigation

[0] Message Index

[#] Next page

[*] Previous page