[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Savannah-hackers-public] Synchronizing your working copy with the resto
From: |
Sylvain Beucler |
Subject: |
[Savannah-hackers-public] Synchronizing your working copy with the restored repository |
Date: |
Fri, 16 Mar 2007 00:10:29 +0000 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.2) Gecko/20070208 Iceweasel/2.0.0.2 (Debian-2.0.0.2+dfsg-3) |
You may be in the situation where you have changes in your CVS working copy
that are not committed in the restored Savannah repository anymore. strk
suggested the following procedure:
0 Get a fresh cvs export from the repository (call it fresh-export)
0 Turn your latest working copy into "export" form (remove everything should
not be fetched by an export - see below)
0 diff -ur fresh-export/ latest-working-copy/ > changes.diff
0 Check the diff, if it contains more then it should, goto (2)
0 Get a fresh cvs checkout (call it fresh-checkout)
0 Apply the diff obtained in step (3) to fresh-checkout/ (with patch)
0 'cvs add' the new stuff (list the new files with "cvs -n update")
0 Build & test patched fresh-checkout/
0 Cross fingers
0 Commit
0 Checkout the whole project again, build&test
Note about step (2), or how to turn your latest working copy into "export"
form:
$ cd latest-working-copy
# Remove CVS/ and compiled files:
$ find . -name "CVS" | xargs rm -Rf # CVS *dirs*
$ find . -name '.#*' | xargs rm # backup copies
$ make clean distclean
$ find . -name 'Makefile' | xargs rm # if autoconf
$ find . -name 'Makefile.in' | xargs rm # if automake
$ rm -Rf configure autom4te.cache aclocal.m4 # generated stuff
Note: if you perform a 'cvs update' in your working copy, CVS will "go back
in time" and revert to the repository version, possibly losing your
uncommited changes.
_______________________________________________
Message posté via/par Savannah
http://savannah.gnu.org/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Savannah-hackers-public] Synchronizing your working copy with the restored repository,
Sylvain Beucler <=