Save/restore git/cvs checkout changes when switching branches?

Posted by Dale Forester on Stack Overflow See other posts from Stack Overflow or by Dale Forester
Published on 2010-05-17T14:55:22Z Indexed on 2010/05/17 15:10 UTC
Read the original article Hit count: 318

Filed under:

git

|

cvs

|

branch

|

rcs

Using cvs, git or another technique (file system level?), I would like to:

Make modifications on branch A
Checkout branch B: Changes to branch A are "stowed away" (by name would be nice), branch B is checked out such that my branch A changes are gone
Make modifications on branch B
Checkout branch A: Changes to branch B are "stowed away" (by name would be nice), branch A is checked out such that my branch B changes are gone but now my "saved" branch A changes from Step #2 are back

Git-stash does not appear to fit the flow I'm describing although my impression could be wrong.

Techniques involving RCS's or file system or command-line tools or otherwise are welcome.

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about cvs

Ensuring all git commits make it back to CVS when using git-cvs

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm using git-cvs, and my general workflow is something like this: ...write some code... $ git commit $ git cvsexportcommit -c -p -v <asdf> $ git cvs-import $CVSROOT $ git pull This generally works fine for pushing my commits back to the CVS server and keeping things in sync. However, I'm… >>> More
CVS: command-line diff on a remote CVS server between two HEAD revs

as seen on Stack Overflow - Search for 'Stack Overflow'
My CVS-fu is not very strong anymore (after years of SVN'ing and now Mercurial'ing). I'm trying to do a diff between two revisions of the HEAD branch (everything is in the HEAD anyway). I received an IDE already set up to use a :pserver:myname@cvsserver:port/cvs/project CVS. I'm on Windows XP. I… >>> More
Permission denied for cvs server via ssh

as seen on Stack Overflow - Search for 'Stack Overflow'
I cant create a new project by importing a java project via eclipse onto my cvs server via internet. I created a directory as root called /priv/cvs/. Then i called "cvs -d /priv/cvs/ init". I created a user named cvs and a groups called cvs. The repository is owned by cvs and in group cvs. Then… >>> More
CVSROOT problem because of username string

as seen on Server Fault - Search for 'Server Fault'
Hi, I have always been SVN user but currently I have to use CVS as the source repository. I am quite new to CVS and really got confused many a times (reason being I always tried to access CVS like SVN !) However now I am really stuck in one problem wherein I am not able to do any cvs operations… >>> More
How to resolve CVS error: cannot rename file CVS/Entries.Extra.Backup to CVS/Entries.Extra: Bad addr

as seen on Stack Overflow - Search for 'Stack Overflow'
I've checked out a module from CVS onto a newly installed Windows 7 machine. The virus scanner has not yet been installed. Later, when I try to do an update, I get the following error message: cannot rename file CVS/Entries.Extra.Backup to CVS/Entries.Extra: Bad address Has anyone seen and resolved… >>> More