.hgignore
author Greg Ward <greg@gerg.ca>
Fri, 30 Sep 2011 21:58:54 -0400
branchstable
changeset 991 68475648cd7e
parent 450 86c17b3e9100
permissions -rw-r--r--
rollback: avoid unsafe rollback when not at tip (issue2998) You can get into trouble if you commit, update back to an older changeset, and then rollback. The update removes your valuable changes from the working dir, then rollback removes them history. Oops: you've just irretrievably lost data running nothing but core Mercurial commands. (More subtly: rollback from a shared clone that was already at an older changeset -- no update required, just rollback from the wrong directory.) The fix assumes that only "commit" transactions have irreplaceable data, and allows rolling back non-commit transactions as always. But when rolling back a commit, check that the working dir is checked out to tip, i.e. the changeset we're about to destroy. If not, abort. You can get back the old (dangerous) behaviour with --force. [ original upstream message ]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     1
syntax: glob
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     2
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     3
*.pyc
124
99dc49c5bcfb Setup standalone module install, version tracking
Christian Ebert <blacktrash@gmx.net>
parents: 0
diff changeset
     4
*.pyo
0
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     5
*~
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     6
*.swp
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     7
*.orig
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     8
*.rej
450
86c17b3e9100 (stable) ignore .DS_Store
Christian Ebert <blacktrash@gmx.net>
parents: 238
diff changeset
     9
.DS_Store
124
99dc49c5bcfb Setup standalone module install, version tracking
Christian Ebert <blacktrash@gmx.net>
parents: 0
diff changeset
    10
212
0ac36a08c320 hgignore build directory
Christian Ebert <blacktrash@gmx.net>
parents: 124
diff changeset
    11
build/*
220
943e1e1ea042 Include MANIFEST.in in dist; hgignore MANIFEST
Christian Ebert <blacktrash@gmx.net>
parents: 212
diff changeset
    12
MANIFEST