Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-flags.out @ 1948:ebe273a16048

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew/templates
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 13 Mar 2006 23:38:14 +0100
parents 7544700fd931
children ced2d3620f95
comparison
equal deleted inserted replaced
1946:9fee186f7f0d 1948:ebe273a16048
10 adding changesets 10 adding changesets
11 adding manifests 11 adding manifests
12 adding file changes 12 adding file changes
13 added 1 changesets with 1 changes to 1 files (+1 heads) 13 added 1 changesets with 1 changes to 1 files (+1 heads)
14 (run 'hg update' to get a working copy) 14 (run 'hg update' to get a working copy)
15 changeset: 2:3ef543305655 15 changeset: 2:b833d578451e
16 tag: tip 16 tag: tip
17 parent: 0:22a449e20da5 17 parent: 0:4536b1c2ca69
18 user: test 18 user: test
19 date: Thu Jan 1 00:00:00 1970 +0000 19 date: Mon Jan 12 13:46:40 1970 +0000
20 summary: chmod +x a 20 summary: chmod +x a
21 21
22 changeset: 1:c6ecefc45368 22 changeset: 1:a187cb361a5a
23 user: test 23 user: test
24 date: Thu Jan 1 00:00:00 1970 +0000 24 date: Mon Jan 12 13:46:40 1970 +0000
25 summary: a updated 25 summary: a updated
26 26
27 changeset: 2:3ef543305655 27 changeset: 2:b833d578451e
28 tag: tip 28 tag: tip
29 parent: 0:22a449e20da5 29 parent: 0:4536b1c2ca69
30 user: test 30 user: test
31 date: Thu Jan 1 00:00:00 1970 +0000 31 date: Mon Jan 12 13:46:40 1970 +0000
32 summary: chmod +x a 32 summary: chmod +x a
33 33
34 changeset: 1:c6ecefc45368 34 changeset: 1:a187cb361a5a
35 user: test 35 user: test
36 date: Thu Jan 1 00:00:00 1970 +0000 36 date: Mon Jan 12 13:46:40 1970 +0000
37 summary: a updated 37 summary: a updated
38 38
39 changeset: 0:22a449e20da5 39 changeset: 0:4536b1c2ca69
40 user: test 40 user: test
41 date: Thu Jan 1 00:00:00 1970 +0000 41 date: Mon Jan 12 13:46:40 1970 +0000
42 summary: added a b 42 summary: added a b
43 43
44 resolving manifests 44 resolving manifests
45 merging a 45 merging a
46 resolving a 46 resolving a
47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
48 (branch merge, don't forget to commit)
47 -rwxr-x--- 49 -rwxr-x---
48 -rwxr-x--- 50 -rwxr-x---