Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/macosx/macosx-build.txt @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 7289d20b18cd |
children |
rev | line source |
---|---|
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 to build a new macosx binary package: |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 |
2575
7289d20b18cd
Redirect MacPython link to point to python.org
Lee Cantey <lcantey@gmail.com>
parents:
1686
diff
changeset
|
3 install macpython from http://www.python.org/download/mac |
1686
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 install py2app from http://pythonmac.org/packages/ |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 make sure /usr/local/bin is in your path |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 run bdist_mpkg in top-level hg directory |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 |
dd5085897010
make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 find packaged stuff in dist directory |