|
hi
The
command would merge the rev 1.2 / 1.4 to ur local copy and after u need to
commit it.
$ cvs
update -j 1.4 -j 1.2 filename.ext
will remove all changes made between revision 1.2 and 1.4.
Regarding the watches
:
You are fine for the action specifically
cvs watch add s1.txt
it would add and notify for all the actions but would
clear its proper working / config
also check the administrative files...... for their
config
regards
Gurpreet S
Hello,
1) When i am trying to adjusting watch with any
file with following.....
$ cvs watch add -a edit -a commit s1.txt
then
cvs starts running continuously for indefinite time.
What is the reason of
it.
And what is the way to adjust a watch on any file.
2) AAnd while
doing merging
let version 1.2 any file has...
:"microsoft"
and version 1.4 of same file has .:"outlook"
Then how
these two version can be merged so that nest version
will have.......
"Microsoft outlook"
and Is it always neccesary that in merging there
will be always conflict
Regards.
vijay
_______________________________________________
Info-cvs mailing list
Info-cvs@xxxxxxx
http://mail.gnu.org/mailman/listinfo/info-cvs
| 
