Mercurial: .hgignore annotate

annotate .hgignore @ 415:c2b9502a4e96

[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----END PGP SIGNATURE-----

author	mpm@selenic.com
date	Tue, 21 Jun 2005 19:14:11 -0800
parents	ca39b80cbe15
children	25afb21d97ba 688d03d6997a

rev	line source
51 0cbcdb855156 Ignore .orig and .rej files from patch mpm@selenic.com parents: 8 diff changeset	1 .*\.orig
0cbcdb855156 Ignore .orig and .rej files from patch mpm@selenic.com parents: 8 diff changeset	2 .*\.rej
1 273ce12ad8f1 Update README to discuss remote pull, rsync, and the hg repo mpm@selenic.com parents: diff changeset	3 .*~
72 4a6ab4d80dc4 Add an O(m + nlog n) patching extension mpm@selenic.com parents: 51 diff changeset	4 .*\.so
3 3a6392190075 Ignore build/ and .pyc files mpm@selenic.com parents: 1 diff changeset	5 .*pyc
3a6392190075 Ignore build/ and .pyc files mpm@selenic.com parents: 1 diff changeset	6 build/.*
8 e5a480dadca3 Ignore MANIFEST mpm@selenic.com parents: 6 diff changeset	7 dist/
e5a480dadca3 Ignore MANIFEST mpm@selenic.com parents: 6 diff changeset	8 MANIFEST$
352 ca39b80cbe15 ignore files associated with quilt mpm@selenic.com parents: 72 diff changeset	9 .pc/
ca39b80cbe15 ignore files associated with quilt mpm@selenic.com parents: 72 diff changeset	10 patches/

Mercurial > hg

annotate .hgignore @ 415:c2b9502a4e96