[parisc-linux] cvs tricks
Michael Ang
mang@subcarrier.org
Tue, 8 Feb 2000 19:51:04 -0500 (EST)
Updating
update to latest working version, get newly add dirs
cvs up -Ad
get linus' 2.3.42 version of a file
cvs up -rlinus2342 somefile
(need to do "cvs up -A" to get back to latest version)
Diffs
between current version and linus2342
cvs di -rlinus2342
our changes
cvs di -r1.1 -rLINUS_2342_PREMERGE
linus' changes from 2.3.29 to 2.3.42
cvs di -rlinus2329 -rlinus2342
changes we've made since checking in 2.3.42 sources to tip
cvs di -rLINUS_2342_FIXUP_START -rHEAD
Merging
merge in linus' changes
cvs up -jrlinus2329 -jlinus2342