Mercurial > hg > mercurial
annotate mercurial-tests/testData/bin/help/diffs.txt @ 1133:c5488a2ba17e default tip
[test-files] new module for testfiles created
author | Vladimir I <vladimir.ilmov@jetbrains.com> |
---|---|
date | Sat, 21 Sep 2024 12:39:51 +0200 |
parents | 2e52f00a3c94 |
children |
rev | line source |
---|---|
294
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
1 Mercurial's default format for showing changes between two versions of |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
2 a file is compatible with the unified format of GNU diff, which can be |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
3 used by GNU patch and many other standard tools. |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
4 |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
5 While this standard format is often enough, it does not encode the |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
6 following information: |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
7 |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
8 - executable status and other permission bits |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
9 - copy or rename information |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
10 - changes in binary files |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
11 - creation or deletion of empty files |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
12 |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
13 Mercurial also supports the extended diff format from the git VCS |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
14 which addresses these limitations. The git diff format is not produced |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
15 by default because a few widespread tools still do not understand this |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
16 format. |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
17 |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
18 This means that when generating diffs from a Mercurial repository |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
19 (e.g. with "hg export"), you should be careful about things like file |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
20 copies and renames or other things mentioned above, because when |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
21 applying a standard diff to a different repository, this extra |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
22 information is lost. Mercurial's internal operations (like push and |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
23 pull) are not affected by this, because they use an internal binary |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
24 format for communicating changes. |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
25 |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
26 To make Mercurial produce the git extended diff format, use the --git |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
27 option available for many commands, or set 'git = True' in the [diff] |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
28 section of your hgrc. You do not need to set this option when |
2e52f00a3c94
Update whole hg distribution to 1.5.2
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
29 importing diffs in this format or using them in the mq extension. |