//----------------------------------------------------------------------------- #include#include //----------------------------------------------------------------------------- int main(void) { printf("Hello, world\n"); return(EXIT_SUCCESS); } //-----------------------------------------------------------------------------
> mkdir HelloWorld > cd HelloWorld/ > vi HelloWorld.c ... > cd ..
RCS file: /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v Working file: HelloWorld.c head: 1.1 branch: 1.1.1 locks: strict access list: symbolic names: Initial: 1.1.1.1 Geoff: 1.1.1 keyword substitution: kv total revisions: 2; selected revisions: 2 description: ---------------------------- revision 1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; lines: +0 -0 Move HelloWorld to CVS =============================================================================
> mkdir CVS > setenv CVSROOT /home/graph/geoff/CSC322/CVS > cvs init > cd HelloWorld/ > cvs import -m "Move HelloWorld to CVS" HelloWorld Geoff Initial N HelloWorld/HelloWorld.c No conflicts created by this import > cd .. > rm -rf HelloWorld/ > cvs checkout HelloWorld cvs checkout: Updating HelloWorld U HelloWorld/HelloWorld.c > cd HelloWorld/ > cvs log cvs log: Logging . ...
RCS file: /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v Working file: HelloWorld.c head: 1.2 branch: locks: strict access list: symbolic names: Initial: 1.1.1.1 Geoff: 1.1.1 keyword substitution: kv total revisions: 3; selected revisions: 3 description: ---------------------------- revision 1.2 date: 2004/04/02 14:31:23; author: geoff; state: Exp; lines: +1 -1 Personalized the greeting ---------------------------- revision 1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; lines: +0 -0 Move HelloWorld to CVS =============================================================================
> vi HelloWorld.c ... > cvs update cvs update: Updating . M HelloWorld.c > cvs commit -m "Personalized the greeting" cvs commit: Examining . Checking in HelloWorld.c; /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v <-- HelloWorld.c new revision: 1.2; previous revision: 1.1 done > cvs log cvs log: Logging . ...
RCS file: /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v Working file: HelloWorld.c head: 1.4 branch: locks: strict access list: symbolic names: Initial: 1.1.1.1 Geoff: 1.1.1 keyword substitution: kv total revisions: 5; selected revisions: 5 description: ---------------------------- revision 1.4 date: 2004/04/02 14:45:14; author: geoff; state: Exp; lines: +1 -1 Made it a kind world ---------------------------- revision 1.3 date: 2004/04/02 14:44:05; author: geoff; state: Exp; lines: +1 -1 Made it a crool world ---------------------------- revision 1.2 date: 2004/04/02 14:31:23; author: geoff; state: Exp; lines: +1 -1 Personalized the greeting ---------------------------- revision 1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; lines: +0 -0 Move HelloWorld to CVS =============================================================================
> cd .. > mkdir AnotherUser > cd AnotherUser/ > cvs checkout HelloWorld cvs checkout: Updating HelloWorld U HelloWorld/HelloWorld.c > cd HelloWorld/ > vi HelloWorld.c ... > cvs commit -m "Made it a crool world" cvs commit: Examining . Checking in HelloWorld.c; /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v <-- HelloWorld.c new revision: 1.3; previous revision: 1.2 done > cd ../../HelloWorld/ > cvs update cvs update: Updating . U HelloWorld.c > vi HelloWorld.c ... > cvs commit -m "Made it a kind world" cvs commit: Examining . Checking in HelloWorld.c; /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v <-- HelloWorld.c new revision: 1.4; previous revision: 1.3 done > cvs log cvs log: Logging . ...
RCS file: /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v Working file: HelloWorld.c head: 1.5 branch: locks: strict access list: symbolic names: Initial: 1.1.1.1 Geoff: 1.1.1 keyword substitution: kv total revisions: 6; selected revisions: 6 description: ---------------------------- revision 1.5 date: 2004/04/02 14:48:16; author: geoff; state: Exp; lines: +1 -1 Made it a very kind world ---------------------------- revision 1.4 date: 2004/04/02 14:45:14; author: geoff; state: Exp; lines: +1 -1 Made it a kind world ---------------------------- revision 1.3 date: 2004/04/02 14:44:05; author: geoff; state: Exp; lines: +1 -1 Made it a crool world ---------------------------- revision 1.2 date: 2004/04/02 14:31:23; author: geoff; state: Exp; lines: +1 -1 Personalized the greeting ---------------------------- revision 1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2004/04/02 14:21:31; author: geoff; state: Exp; lines: +0 -0 Move HelloWorld to CVS =============================================================================
> cd ../AnotherUser/HelloWorld/ > vi HelloWorld.c ... > cvs update cvs update: Updating . RCS file: /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v retrieving revision 1.3 retrieving revision 1.4 Merging differences between 1.3 and 1.4 into HelloWorld.c rcsmerge: warning: conflicts during merge cvs update: conflicts found in HelloWorld.c C HelloWorld.c > vi HelloWorld.c ... > cvs commit -m "Made it a very kind world" cvs commit: Examining . Checking in HelloWorld.c; /home/graph/geoff/CSC322/CVS/HelloWorld/HelloWorld.c,v <-- HelloWorld.c new revision: 1.5; previous revision: 1.4 done > cvs log cvs log: Logging . ...