subversion question

Posts   
 
    
erichar11
User
Posts: 268
Joined: 08-Dec-2003
# Posted on: 17-Jul-2005 16:46:39   

Hi all, looking for a little help here with subversion. In my project I just added some new functionality which isn't quite working they way I want it to. Now I want to save those changes to the repository in the hope that I can eventually goback and work on it at a later date. However, I want to also revert back to the previous version prior to the changes being implemented so I can continue working on other parts of the application. So what is the best way to handle this. Should I just commit my current changes and revert back to the previous version and continue working? Or should I create a branch or something? Not sure what I should do.

Thanks

Devildog74
User
Posts: 719
Joined: 04-Feb-2004
# Posted on: 17-Jul-2005 18:03:40   

Dont quote me on this, but I think that I would commit the current work, then branch the current work, then revert the current work to the previous revision.

That makes the most logical sense to me.

I am pretty sure thats would you would do.

erichar11
User
Posts: 268
Joined: 08-Dec-2003
# Posted on: 18-Jul-2005 01:54:18   

Thanks, thats what I did which seems to work fine with one problem. I'm getting conflict statements in my .suo and csproj files. Just wondering if thoses files as well as the .user files should be included in source control.

Devildog74
User
Posts: 719
Joined: 04-Feb-2004
# Posted on: 18-Jul-2005 02:38:21   

the csproj files i would version, but the other 2 no, as they are simply user settings files and get created if they dont exist.