Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/win32/postinstall.txt @ 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 | 1ef8ada4370f |
children |
rev | line source |
---|---|
1289
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 Welcome to Mercurial for Windows! |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 --------------------------------- |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 For configuration and usage directions, please read the ReadMe.html |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 file that comes with this package. |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
2681
diff
changeset
|
7 Also check the release notes at: |
2276
766c3c852786
Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents:
2216
diff
changeset
|
8 |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
2681
diff
changeset
|
9 http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew |