.hgignore
author Greg Ward <greg@gerg.ca>
Sun, 02 Oct 2011 14:34:28 -0400
branchstable
changeset 985 d60568a69465
parent 450 86c17b3e9100
permissions -rw-r--r--
import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now. [ 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