Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/win32/mercurial.ini @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 12:33:12 -0500 |
parents | 2300632a3bc8 |
children | 778bab992732 ea7b982b6c08 |
rev | line source |
---|---|
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 ; System-wide Mercurial config file. To override these settings on a |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 ; per-user basis, please edit the following file instead, where |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 ; USERNAME is your Windows user name: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 ; C:\Documents and Settings\USERNAME\Mercurial.ini |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
3422
2300632a3bc8
Default editor for Windows installer is now notepad. [Issue 256]
Lee Cantey <lcantey@gmail.com>
parents:
2550
diff
changeset
|
6 [ui] |
2300632a3bc8
Default editor for Windows installer is now notepad. [Issue 256]
Lee Cantey <lcantey@gmail.com>
parents:
2550
diff
changeset
|
7 editor = notepad |
2300632a3bc8
Default editor for Windows installer is now notepad. [Issue 256]
Lee Cantey <lcantey@gmail.com>
parents:
2550
diff
changeset
|
8 |
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 ; By default, we try to encode and decode all files that do not |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 ; contain ASCII NUL characters. What this means is that we try to set |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 ; line endings to Windows style on update, and to Unix style on |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 ; commit. This lets us cooperate with Linux and Unix users, so |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 ; everybody sees files with their native line endings. |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 [extensions] |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 ; The win32text extension is available and installed by default. It |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 ; provides built-in Python hooks to perform line ending conversions. |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 ; This is normally much faster than running an external program. |
1303
2dc06dd76ff4
Fix path of win32text extension in INI file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1298
diff
changeset
|
19 hgext.win32text = |
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
22 [encode] |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
23 ; Encode files that don't contain NUL characters. |
2550
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
24 |
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
25 ; ** = cleverencode: |
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 ; Alternatively, you can explicitly specify each file extension that |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
28 ; you want encoded (any you omit will be left untouched), like this: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
29 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
30 ; *.txt = dumbencode: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
31 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
32 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
33 [decode] |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
34 ; Decode files that don't contain NUL characters. |
2550
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
35 |
45235e492cc6
Disable automatic line endings conversion on windows
Raphael Marmier <raphael@marmier.net>
parents:
1303
diff
changeset
|
36 ; ** = cleverdecode: |
1298
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
37 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
38 ; Alternatively, you can explicitly specify each file extension that |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
39 ; you want decoded (any you omit will be left untouched), like this: |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
40 |
d843eaadee79
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
41 ; **.txt = dumbdecode: |