Mercurial > hg

annotate tests/test-basic.out @ 415:c2b9502a4e96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 398737777644
children d96c1153b25d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
1 + mkdir t
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 + cd t
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 + hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 + echo a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 + hg add a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t test -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 + hg history
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
9 tag: tip
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 user: test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
11 date: Thu Jan 1 00:00:00 1970
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 summary: test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
14 + hg manifest
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 + hg cat a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 + hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
22 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 1 files, 1 changesets, 1 total revisions