1 --- mercurial-1.3.1/doc/hg.1 Thu Jul 23 10:58:26 2009 |
|
2 +++ /usr/share/man/man1/hg.1 Tue Feb 19 05:28:30 2002 |
|
3 @@ -1,4 +1,9 @@ |
|
4 '\" t |
|
5 +.\" |
|
6 +.\" Modified for Solaris to to add the Solaris stability classification, |
|
7 +.\" and to add a note about source availability. |
|
8 +.\" |
|
9 +'\" t |
|
10 .\" Title: hg |
|
11 .\" Author: [see the "AUTHOR" section] |
|
12 .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/> |
|
13 @@ -757,7 +762,7 @@ |
|
14 .RS 4 |
|
15 .\} |
|
16 .nf |
|
17 -$ cp \-al REPO REPOCLONE |
|
18 +$ /usr/gnu/bin/cp \-al REPO REPOCLONE |
|
19 .fi |
|
20 .if n \{\ |
|
21 .RE |
|
22 @@ -4331,6 +4336,12 @@ |
|
23 .RE |
|
24 .sp |
|
25 Some commands (e\&.g\&. revert) produce backup files ending in \&.orig, if the \&.orig file already exists and is not tracked by Mercurial, it will be overwritten\&. |
|
26 +.TP |
|
27 +/usr/demo/mercurial |
|
28 +This directory contains assorted files which are part of the Mercurial |
|
29 +distribution, but not core to its functionality&. They will generally |
|
30 +need to be copied elsewhere to be of use. |
|
31 + |
|
32 .SH "BUGS" |
|
33 .sp |
|
34 Probably lots, please post them to the mailing list (See Resources below) when you find them\&. |
|
35 @@ -4376,3 +4387,23 @@ |
|
36 .RS 4 |
|
37 \%http://selenic.com/mailman/listinfo/mercurial |
|
38 .RE |
|
39 +.\" Begin Sun update |
|
40 +.SH ATTRIBUTES |
|
41 +See |
|
42 +.BR attributes (5) |
|
43 +for descriptions of the following attributes: |
|
44 +.sp |
|
45 +.TS |
|
46 +box; |
|
47 +cbp-1 | cbp-1 |
|
48 +l | l . |
|
49 +ATTRIBUTE TYPE ATTRIBUTE VALUE |
|
50 += |
|
51 +Availability developer/versioning/mercurial |
|
52 += |
|
53 +Interface Stability Volatile |
|
54 +.TE |
|
55 +.PP |
|
56 +.SH NOTES |
|
57 +Source for Mercurial is available on http://opensolaris.org. |
|
58 +.\" End Sun update |
|
59 --- mercurial-1.3.1/doc/hgrc.5 Thu Jul 23 10:58:38 2009 |
|
60 +++ /usr/share/man/man5/hgrc.5 Tue Feb 19 05:28:30 2002 |
|
61 @@ -1,4 +1,9 @@ |
|
62 '\" t |
|
63 +.\" |
|
64 +.\" Modified for Solaris to to add the Solaris stability classification, |
|
65 +.\" and to add a note about source availability. |
|
66 +.\" |
|
67 +'\" t |
|
68 .\" Title: hgrc |
|
69 .\" Author: [see the "AUTHOR" section] |
|
70 .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/> |
|
71 @@ -27,7 +32,7 @@ |
|
72 .sp |
|
73 Mercurial reads configuration data from several files, if they exist\&. The names of these files depend on the system on which Mercurial is installed\&. *\&.rc files from a single directory are read in alphabetical order, later ones overriding earlier ones\&. Where multiple paths are given below, settings from later paths override earlier ones\&. |
|
74 .PP |
|
75 -(Unix) <install\-root>/etc/mercurial/hgrc\&.d/*\&.rc, (Unix) <install\-root>/etc/mercurial/hgrc |
|
76 +<install\-root>/etc/mercurial/hgrc\&.d/*\&.rc, <install\-root>/etc/mercurial/hgrc |
|
77 .RS 4 |
|
78 Per\-installation configuration files, searched for in the directory where Mercurial is installed\&. |
|
79 <install\-root> |
|
80 @@ -36,12 +41,12 @@ |
|
81 /shared/tools/etc/mercurial/hgrc\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&. |
|
82 .RE |
|
83 .PP |
|
84 -(Unix) /etc/mercurial/hgrc\&.d/*\&.rc, (Unix) /etc/mercurial/hgrc |
|
85 +/etc/mercurial/hgrc\&.d/*\&.rc, /etc/mercurial/hgrc |
|
86 .RS 4 |
|
87 Per\-system configuration files, for the system on which Mercurial is running\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&. Options in these files override per\-installation options\&. |
|
88 .RE |
|
89 .PP |
|
90 -(Windows) <install\-dir>\eMercurial\&.ini, or else, (Windows) HKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial, or else, (Windows) C:\eMercurial\eMercurial\&.ini |
|
91 +(Windows) <install\-dir>\eMercurial\&.ini, or else |
|
92 .RS 4 |
|
93 Per\-installation/system configuration files, for the system on which Mercurial is running\&. Options in these files apply to all Mercurial commands executed by any user in any directory\&. Registry keys contain PATH\-like strings, every part of which must reference a |
|
94 Mercurial\&.ini |
|
95 @@ -50,7 +55,7 @@ |
|
96 files will be read\&. |
|
97 .RE |
|
98 .PP |
|
99 -(Unix) $HOME/\&.hgrc, (Windows) %HOME%\eMercurial\&.ini, (Windows) %HOME%\e\&.hgrc, (Windows) %USERPROFILE%\eMercurial\&.ini, (Windows) %USERPROFILE%\e\&.hgrc |
|
100 +$HOME/\&.hgrc |
|
101 .RS 4 |
|
102 Per\-user configuration file(s), for the user running Mercurial\&. On Windows 9x, |
|
103 %HOME% |
|
104 @@ -58,7 +63,7 @@ |
|
105 %APPDATA%\&. Options in these files apply to all Mercurial commands executed by this user in any directory\&. Options in these files override per\-installation and per\-system options\&. |
|
106 .RE |
|
107 .PP |
|
108 -(Unix, Windows) <repo>/\&.hg/hgrc |
|
109 +<repo>/\&.hg/hgrc |
|
110 .RS 4 |
|
111 Per\-repository configuration options that only apply in a particular repository\&. This file is not version\-controlled, and will not get transferred during a "clone" operation\&. Options in this file override options in all other configuration files\&. On Unix, most of this file will be ignored if it doesn\(cqt belong to a trusted user or to a trusted group\&. See the documentation for the trusted section below for more details\&. |
|
112 .RE |
|
113 @@ -874,7 +879,7 @@ |
|
114 patch content and patched files end of lines are preserved\&. When set to |
|
115 \fIlf\fR |
|
116 or |
|
117 -\fIcrlf\fR, both files end of lines are ignored when patching and the result line endings are normalized to either LF (Unix) or CRLF (Windows)\&. Default: strict\&. |
|
118 +\fIcrlf\fR, both files end of lines are ignored when patching and the result line endings are normalized to either LF or CRLF (Windows)\&. Default: strict\&. |
|
119 .RE |
|
120 .RE |
|
121 .PP |
|
122 @@ -1275,3 +1280,23 @@ |
|
123 .RS 4 |
|
124 \%mailto:[email protected] |
|
125 .RE |
|
126 +.\" Begin Sun update |
|
127 +.SH ATTRIBUTES |
|
128 +See |
|
129 +.BR attributes (5) |
|
130 +for descriptions of the following attributes: |
|
131 +.sp |
|
132 +.TS |
|
133 +box; |
|
134 +cbp-1 | cbp-1 |
|
135 +l | l . |
|
136 +ATTRIBUTE TYPE ATTRIBUTE VALUE |
|
137 += |
|
138 +Availability developer/versioning/mercurial |
|
139 += |
|
140 +Interface Stability Volatile |
|
141 +.TE |
|
142 +.PP |
|
143 +.SH NOTES |
|
144 +Source for Mercurial is available on http://opensolaris.org. |
|
145 +.\" End Sun update |
|
146 --- mercurial-1.3.1/doc/hgignore.5 Thu Jul 23 10:58:30 2009 |
|
147 +++ /usr/share/man/man5/hgignore.5 Tue Feb 19 05:28:30 2002 |
|
148 @@ -1,4 +1,9 @@ |
|
149 '\" t |
|
150 +.\" |
|
151 +.\" Modified for Solaris to to add the Solaris stability classification, |
|
152 +.\" and to add a note about source availability. |
|
153 +.\" |
|
154 +'\" t |
|
155 .\" Title: hgignore |
|
156 .\" Author: [see the "AUTHOR" section] |
|
157 .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/> |
|
158 @@ -119,3 +124,23 @@ |
|
159 .RS 4 |
|
160 \%mailto:[email protected] |
|
161 .RE |
|
162 +.\" Begin Sun update |
|
163 +.SH ATTRIBUTES |
|
164 +See |
|
165 +.BR attributes (5) |
|
166 +for descriptions of the following attributes: |
|
167 +.sp |
|
168 +.TS |
|
169 +box; |
|
170 +cbp-1 | cbp-1 |
|
171 +l | l . |
|
172 +ATTRIBUTE TYPE ATTRIBUTE VALUE |
|
173 += |
|
174 +Availability developer/versioning/mercurial |
|
175 += |
|
176 +Interface Stability Volatile |
|
177 +.TE |
|
178 +.PP |
|
179 +.SH NOTES |
|
180 +Source for Mercurial is available on http://opensolaris.org. |
|
181 +.\" End Sun update |
|