comparison tests/test-flags.out @ 925:5a034646e472

run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.
author mpm@selenic.com
date Tue, 16 Aug 2005 19:03:01 -0800
parents 0902ffece4b4
children 1f3710636b45 4f81068ed8cd
comparison
equal deleted inserted replaced
924:ab681ea2857e 925:5a034646e472
1 + hg init
2 + hg add a b
3 + hg ci -m added a b -d 0 0
4 + hg init
5 + hg pull ../test1
6 pulling from ../test1 1 pulling from ../test1
7 requesting all changes 2 requesting all changes
8 adding changesets 3 adding changesets
9 adding manifests 4 adding manifests
10 adding file changes 5 adding file changes
11 added 1 changesets with 2 changes to 2 files 6 added 1 changesets with 2 changes to 2 files
12 (run 'hg update' to get a working copy) 7 (run 'hg update' to get a working copy)
13 + hg co
14 + hg ci -m chmod +x a -d 0 0
15 + hg ci -m a updated -d 0 0
16 + hg pull ../test2
17 pulling from ../test2 8 pulling from ../test2
18 searching for changes 9 searching for changes
19 adding changesets 10 adding changesets
20 adding manifests 11 adding manifests
21 adding file changes 12 adding file changes
22 added 1 changesets with 1 changes to 1 files 13 added 1 changesets with 1 changes to 1 files
23 (run 'hg update' to get a working copy) 14 (run 'hg update' to get a working copy)
24 + hg heads
25 changeset: 2:3ef543305655 15 changeset: 2:3ef543305655
26 tag: tip 16 tag: tip
27 parent: 0:22a449e20da5 17 parent: 0:22a449e20da5
28 user: test 18 user: test
29 date: Thu Jan 1 00:00:00 1970 19 date: Thu Jan 1 00:00:00 1970
32 changeset: 1:c6ecefc45368 22 changeset: 1:c6ecefc45368
33 user: test 23 user: test
34 date: Thu Jan 1 00:00:00 1970 24 date: Thu Jan 1 00:00:00 1970
35 summary: a updated 25 summary: a updated
36 26
37 + hg history
38 changeset: 2:3ef543305655 27 changeset: 2:3ef543305655
39 tag: tip 28 tag: tip
40 parent: 0:22a449e20da5 29 parent: 0:22a449e20da5
41 user: test 30 user: test
42 date: Thu Jan 1 00:00:00 1970 31 date: Thu Jan 1 00:00:00 1970
50 changeset: 0:22a449e20da5 39 changeset: 0:22a449e20da5
51 user: test 40 user: test
52 date: Thu Jan 1 00:00:00 1970 41 date: Thu Jan 1 00:00:00 1970
53 summary: added a b 42 summary: added a b
54 43
55 + hg -v co -m
56 resolving manifests 44 resolving manifests
57 merging a 45 merging a
58 resolving a 46 resolving a
59 -rwxr-x--- 47 -rwxr-x---
60 -rwxr-x--- 48 -rwxr-x---