summaryrefslogtreecommitdiff
path: root/gnu/dist/cvs/FAQ
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2003-12-10 05:58:05 +0000
committeritojun <itojun@NetBSD.org>2003-12-10 05:58:05 +0000
commit4f87169ef468c63a4dfad6527f2e2ce15f9ff3ed (patch)
treeaccc45dcf4c4a9134dfeb0b6d5097af8a051e1ef /gnu/dist/cvs/FAQ
parentc81f32fe6c1af401e021c790893f89dd99db81ec (diff)
cvs 1.11.10, includes security fix
Diffstat (limited to 'gnu/dist/cvs/FAQ')
-rw-r--r--gnu/dist/cvs/FAQ6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/dist/cvs/FAQ b/gnu/dist/cvs/FAQ
index a7941d3d126..6d8f3c1ba88 100644
--- a/gnu/dist/cvs/FAQ
+++ b/gnu/dist/cvs/FAQ
@@ -1897,7 +1897,9 @@ You can branch a branch.
Note that according to the official GIC page at
http://www.cpsc.ucalgary.ca/redirect/grouplab/projects/gic/
GIC is no longer being maintained and tkCVS is recommended
- instead. For more on tkCVS, see http://www.cyclic.com/tkcvs/
+ instead.
+
+ For more on tkCVS, see http://www.cvshome.org/dev/addontkcvs.html.
kingdon@cyclic.com
@@ -4330,7 +4332,7 @@ kingdon@cyclic.com
You should be able to run:
- sort +0.1 ${dir1}/history ${dir2}/history > history
+ sort -k 1.2 ${dir1}/history ${dir2}/history > history
If you "diff" a standard history file before and after such a sort,
you might see other differences caused by garbage (split lines, nulls,