I thought it might be nice to give some details about
what state opencvs is in after the hackathon.
the best way to do this is probably with some examples.
so here goes:
we need a repository to test on, lets import it:
[EMAIL PROTECTED]:~/test/misctest > opencvs -d ~/test/repo import -m "initial
import" misctest misctest misctest_1
N misctest/file1
N misctest/subdir/gahgah
No conflicts created by this import.
[EMAIL PROTECTED]:~/test/misctest >
now let us check it out again:
[EMAIL PROTECTED]:~/test > opencvs -d ~/test/repo co misctest
U misctest/file1
U misctest/subdir/gahgah
[EMAIL PROTECTED]:~/test >
okay that went good, lets show off our status command:
[EMAIL PROTECTED]:~/test/misctest > opencvs status file1
===================================================================
File: file1 Status: Up-to-date
Working revision: 1.1.1.1 Sun Jun 4 15:34:26 2006
Repository revision: 1.1.1.1 /home/joris/test/repo/misctest/file1,v
Sticky Tag: (none)
Sticky Options: (none)
[EMAIL PROTECTED]:~/test/misctest >
awesome, now we modify file1 and will want to commit if of course:
[EMAIL PROTECTED]:~/test/misctest > opencvs up
M file1
[EMAIL PROTECTED]:~/test/misctest > opencvs ci -m "i modified file1" file1
Checking in file1:
/home/joris/test/repo/misctest/file1,v <- file1
old revision: 1.1.1.1; new revision: 1.2
done
[EMAIL PROTECTED]:~/test/misctest >
sweet, that worked but im kinda getting sick of subdir and gahgah:
[EMAIL PROTECTED]:~/test/misctest > opencvs remove -f subdir/gahgah
[EMAIL PROTECTED]:~/test/misctest > opencvs up
R subdir/gahgah
[EMAIL PROTECTED]:~/test/misctest > opencvs ci -m "byebye"
Checking in subdir/gahgah:
/home/joris/test/repo/misctest/subdir/gahgah,v <- subdir/gahgah
old revision: 1.1.1.1; new revision: Removed
done
[EMAIL PROTECTED]:~/test/misctest > ls
CVS file1 subdir
[EMAIL PROTECTED]:~/test/misctest > opencvs up -P
[EMAIL PROTECTED]:~/test/misctest > ls
CVS file1
[EMAIL PROTECTED]:~/test/misctest >
showing off add is cool too:
[EMAIL PROTECTED]:~/test/misctest > touch newfile
[EMAIL PROTECTED]:~/test/misctest > opencvs add newfile
opencvs add: scheduling file 'newfile' for addition
opencvs add: use 'opencvs commit' to add this file permanently
[EMAIL PROTECTED]:~/test/misctest > opencvs ci -m "goodday to you sir" newfile
Checking in newfile:
/home/joris/test/repo/misctest/newfile,v <- newfile
old revision: Non-existent; new revision: 1.1
done
[EMAIL PROTECTED]:~/test/misctest >
so we have modified our repo a bit, lets import a new 'release' into
our repository:
[EMAIL PROTECTED]:~/test/misctest > opencvs -d ~/test/repo import -m "new
release" misctest misctest misctest_2
C misctest/file1
C misctest/newfile
2 conflicts created by this import.
Use the following command to help the merge:
opencvs checkout -jmisctest:yesterday -jmisctest misctest
[EMAIL PROTECTED]:~/test/misctest >
well checkout -j isnt working yet so i cannot show you guys that,
however i can use diff to see what changed between releases:
[EMAIL PROTECTED]:~/test/misctest > opencvs diff -up -rmisctest_1 -rmisctest_2
file1
Index: file1
===================================================================
RCS file: /home/joris/test/repo/misctest/file1,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.2
diff -u -p -u -p -r1.1.1.1 -r1.1.1.2 file1
--- file1 04 Jun 2006 15:34:26 1.1.1.1
+++ file1 04 Jun 2006 15:47:30 1.1.1.2
@@ -1 +1,3 @@
file1
+foo foo foo
+dkwql;
[EMAIL PROTECTED]:~/test/misctest >
that should be about it.
let me be clear that not everything that is working is being
showed here. all of this is on a local repository we are
hacking on remote support right now.
why did i send this mail now? well since opencvs is pretty
usable in a local setup, people who are brave enough
can try it out on local repositories, heck i already
use opencvs for everything on my own repositories.
if you run into any bugs let us know.
i hope you enjoyed the show ;-)
.joris
