Mercurial > hg
annotate contrib/win32/postinstall.txt @ 13155:f02d7a562a21
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)
This patch avoids empty commit when .hgsubstate is dirty. Empty commit
was caused by .hgsubstate being updated back to the state of the
working copy parent when committing, if a user had changed it manually
and not made any changes in subrepositories.
The subrepository state from the working copies parent is compared
with the state calculated as a result of trying to commit the
subrepositories. If the two states are the same, then return None
otherwise the commit is just done.
The line: "committing subrepository x" will be written if there is
nothing committed, but .hgsubstate is dirty for x subrepository.
author | Erik Zielke <ez@aragost.com> |
---|---|
date | Mon, 29 Nov 2010 09:37:23 +0100 |
parents | 1de6e7e1bb9f |
children | 4b0fc75f9403 |
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 |
8936
1de6e7e1bb9f
change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
3863
diff
changeset
|
9 http://mercurial.selenic.com/wiki/WhatsNew |