Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-flags.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 853bfbf1a312 |
children | 1f9ec150a476 |
comparison
equal
deleted
inserted
replaced
792:49ec802b4a16 | 793:445970ccf57a |
---|---|
12 + hg pull ../test1 | 12 + hg pull ../test1 |
13 pulling from ../test1 | 13 pulling from ../test1 |
14 requesting all changes | 14 requesting all changes |
15 adding changesets | 15 adding changesets |
16 adding manifests | 16 adding manifests |
17 adding file revisions | 17 adding file changes |
18 modified 2 files, added 1 changesets and 2 new revisions | 18 added 1 changesets with 2 changes to 2 files |
19 (run 'hg update' to get a working copy) | 19 (run 'hg update' to get a working copy) |
20 + hg co | 20 + hg co |
21 + chmod +x a | 21 + chmod +x a |
22 + hg ci -m 'chmod +x a' -d '0 0' | 22 + hg ci -m 'chmod +x a' -d '0 0' |
23 + cd ../test1 | 23 + cd ../test1 |
26 + hg pull ../test2 | 26 + hg pull ../test2 |
27 pulling from ../test2 | 27 pulling from ../test2 |
28 searching for changes | 28 searching for changes |
29 adding changesets | 29 adding changesets |
30 adding manifests | 30 adding manifests |
31 adding file revisions | 31 adding file changes |
32 modified 1 files, added 1 changesets and 1 new revisions | 32 added 1 changesets with 1 changes to 1 files |
33 (run 'hg update' to get a working copy) | 33 (run 'hg update' to get a working copy) |
34 + hg heads | 34 + hg heads |
35 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | 35 changeset: 2:3ef543305655 |
36 tag: tip | 36 tag: tip |
37 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | 37 parent: 0:22a449e20da5 |
38 user: test | 38 user: test |
39 date: Thu Jan 1 00:00:00 1970 | 39 date: Thu Jan 1 00:00:00 1970 |
40 summary: chmod +x a | 40 summary: chmod +x a |
41 | 41 |
42 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | 42 changeset: 1:c6ecefc45368 |
43 user: test | 43 user: test |
44 date: Thu Jan 1 00:00:00 1970 | 44 date: Thu Jan 1 00:00:00 1970 |
45 summary: a updated | 45 summary: a updated |
46 | 46 |
47 + hg history | 47 + hg history |
48 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | 48 changeset: 2:3ef543305655 |
49 tag: tip | 49 tag: tip |
50 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | 50 parent: 0:22a449e20da5 |
51 user: test | 51 user: test |
52 date: Thu Jan 1 00:00:00 1970 | 52 date: Thu Jan 1 00:00:00 1970 |
53 summary: chmod +x a | 53 summary: chmod +x a |
54 | 54 |
55 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | 55 changeset: 1:c6ecefc45368 |
56 user: test | 56 user: test |
57 date: Thu Jan 1 00:00:00 1970 | 57 date: Thu Jan 1 00:00:00 1970 |
58 summary: a updated | 58 summary: a updated |
59 | 59 |
60 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | 60 changeset: 0:22a449e20da5 |
61 user: test | 61 user: test |
62 date: Thu Jan 1 00:00:00 1970 | 62 date: Thu Jan 1 00:00:00 1970 |
63 summary: added a b | 63 summary: added a b |
64 | 64 |
65 + hg -v co -m | 65 + hg -v co -m |