author | Boris Feld <boris.feld@octobus.net> |
Fri, 26 May 2017 10:05:27 +0200 | |
changeset 2486 | cd4290f923b7 |
child 2487 | 590da9c523ae |
permissions | -rw-r--r-- |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 |
This test file test the various templates for precursors and successors. |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
Global setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
============ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 |
$ . $TESTDIR/testlib/common.sh |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
$ cat >> $HGRCPATH <<EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
> [ui] |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 |
> interactive = true |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 |
> [phases] |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
> publish=False |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 |
> [extensions] |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 |
> evolve = |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 |
> [alias] |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 |
> tlog = log -G -T '{node|short} Precursors: {precursors}\n' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 |
> EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 |
Test templates on amended commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 |
================================ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 |
$ hg init $TESTTMP/templates-local-amend |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 |
$ cd $TESTTMP/templates-local-amend |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 |
$ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
$ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 |
$ echo 42 >> A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
$ hg amend -m "A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
> |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 |
> Better commit message" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
32 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
@ changeset: 3:4ae3a4151de9 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
| summary: A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
| x changeset: 2:f137d23bb3e1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
| | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 |
| | summary: temporary amend commit for 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 |
| x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 |
Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 |
--------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 |
$ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 |
working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 |
(use 'hg evolve' to update to its successor: 4ae3a4151de9) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 |
Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 |
o 4ae3a4151de9 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 |
| @ 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 |
$ hg up 'desc(A1)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 |
Precursors template should not show a precursor as it's not displayed in the |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 |
log |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 |
@ 4ae3a4151de9 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
77 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
79 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 |
Precursors template should show the precursor as we force its display with |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 |
--hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 |
$ hg tlog --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 |
@ 4ae3a4151de9 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
84 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 |
| x f137d23bb3e1 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
89 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
91 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
92 |
Test templates with splitted commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
93 |
=================================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
95 |
$ hg init $TESTTMP/templates-local-split |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
96 |
$ cd $TESTTMP/templates-local-split |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
97 |
$ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
98 |
$ echo 42 >> a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
99 |
$ echo 43 >> b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 |
$ hg commit -A -m "A0" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 |
adding a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
102 |
adding b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
103 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
104 |
@ changeset: 1:471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
105 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
106 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
107 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
109 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
110 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
111 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
112 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
113 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
114 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
115 |
$ hg split -r 'desc(A0)' -d "0 0" << EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
116 |
> y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
117 |
> y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
118 |
> n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
119 |
> n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
120 |
> y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
121 |
> y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
122 |
> EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
123 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
124 |
adding a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
125 |
adding b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
126 |
diff --git a/a b/a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
127 |
new file mode 100644 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
128 |
examine changes to 'a'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
129 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
130 |
@@ -0,0 +1,1 @@ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
131 |
+42 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
132 |
record change 1/2 to 'a'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
133 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
134 |
diff --git a/b b/b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
135 |
new file mode 100644 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
136 |
examine changes to 'b'? [Ynesfdaq?] n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
137 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
138 |
created new head |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
139 |
Done splitting? [yN] n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 |
diff --git a/b b/b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
141 |
new file mode 100644 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 |
examine changes to 'b'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
143 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
144 |
@@ -0,0 +1,1 @@ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 |
+43 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
146 |
record this change to 'b'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
147 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
148 |
no more change to split |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
149 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 |
@ changeset: 3:f257fde29c7a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
153 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
154 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
155 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
156 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 |
o changeset: 2:337fec4d2edc |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
161 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 |
| x changeset: 1:471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
166 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
167 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
171 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
173 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 |
Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 |
--------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
176 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
177 |
$ hg up 'obsolete()' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
178 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 |
working directory parent is obsolete! (471597cad322) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 |
(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
181 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
182 |
Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
183 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 |
o f257fde29c7a Precursors: 471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 |
o 337fec4d2edc Precursors: 471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 |
| @ 471597cad322 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
189 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 |
$ hg up f257fde29c7a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 |
Precursors template should not show a precursor as it's not displayed in the |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 |
log |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 |
@ f257fde29c7a Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 |
o 337fec4d2edc Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
201 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 |
Precursors template should show the precursor as we force its display with |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 |
--hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 |
$ hg tlog --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 |
@ f257fde29c7a Precursors: 471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 |
o 337fec4d2edc Precursors: 471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
211 |
| x 471597cad322 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
212 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 |
Test templates with folded commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
216 |
============================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
217 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
218 |
Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
219 |
---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
220 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
221 |
$ hg init $TESTTMP/templates-local-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
222 |
$ cd $TESTTMP/templates-local-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
223 |
$ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
224 |
$ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
225 |
$ mkcommit B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
226 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
227 |
@ changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
228 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
229 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
230 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
231 |
| summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
232 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
233 |
o changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
234 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
235 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
236 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
237 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
238 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
239 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
240 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
241 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
242 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
243 |
$ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
244 |
2 changesets folded |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
245 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
246 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
247 |
@ changeset: 3:eb5a0daa2192 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
248 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
249 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
250 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
251 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
252 |
| summary: C0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
253 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
254 |
| x changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
255 |
| | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
256 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
257 |
| | summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
258 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
259 |
| x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
260 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
261 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
262 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
263 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
264 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
265 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
266 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
267 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
268 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
269 |
Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
270 |
--------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
271 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
272 |
$ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
273 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
274 |
working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
275 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
276 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
277 |
Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
278 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
279 |
o eb5a0daa2192 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
280 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
281 |
| @ 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
282 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
283 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
284 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
285 |
$ hg up 'desc(B0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
286 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
287 |
working directory parent is obsolete! (0dec01379d3b) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
290 |
Precursors template should show both precursors as they should be both |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
291 |
displayed |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
293 |
o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
295 |
| @ 0dec01379d3b Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
297 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
299 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
300 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
301 |
$ hg up 'desc(C0)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
302 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
303 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
304 |
Precursors template should not show precursors as it's not displayed in the |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
305 |
log |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
306 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
307 |
@ eb5a0daa2192 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
308 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
309 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
310 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
311 |
Precursors template should show both precursors as we force its display with |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
312 |
--hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
313 |
$ hg tlog --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
314 |
@ eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
315 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
316 |
| x 0dec01379d3b Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
317 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
318 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
319 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
320 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
321 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
322 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
323 |
Test templates with divergence |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 |
============================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
326 |
Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
327 |
---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
328 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
329 |
$ hg init $TESTTMP/templates-local-divergence |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
330 |
$ cd $TESTTMP/templates-local-divergence |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
331 |
$ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
332 |
$ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
333 |
$ hg amend -m "A1" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
334 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
335 |
@ changeset: 2:fdf9bde5129a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
336 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
337 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
338 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
339 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
340 |
| summary: A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
341 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
342 |
| x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
343 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
344 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
345 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
346 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
347 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
348 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
349 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
350 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
351 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
352 |
$ hg update --hidden 'desc(A0)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
353 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
354 |
working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
355 |
(use 'hg evolve' to update to its successor: fdf9bde5129a) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
356 |
$ hg amend -m "A2" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
357 |
2 new divergent changesets |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
358 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
359 |
@ changeset: 3:65b757b745b9 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
360 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
361 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
362 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
363 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
364 |
| trouble: divergent |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
365 |
| summary: A2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
366 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
367 |
| o changeset: 2:fdf9bde5129a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
368 |
|/ parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
369 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
370 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
371 |
| trouble: divergent |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
372 |
| summary: A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
373 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
374 |
| x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
375 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
376 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
377 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
378 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
379 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
380 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
381 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
382 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
383 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
384 |
Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
385 |
--------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
386 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
387 |
$ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
388 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
389 |
working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
390 |
(471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
391 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
392 |
Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
393 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
394 |
o 65b757b745b9 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
395 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
396 |
| o fdf9bde5129a Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
397 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
398 |
| @ 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
399 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
400 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
401 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
402 |
$ hg up 'desc(A1)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
403 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
404 |
Precursors template should not show precursors as it's not displayed in the |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
405 |
log |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
406 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
407 |
o 65b757b745b9 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
408 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
409 |
| @ fdf9bde5129a Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
410 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
411 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
412 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
413 |
Precursors template should a precursor as we force its display with --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
414 |
$ hg tlog --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
415 |
o 65b757b745b9 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
416 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
417 |
| @ fdf9bde5129a Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
418 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
419 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
420 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
421 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
422 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
423 |
Test templates with amended + folded commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
424 |
=========================================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
425 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
426 |
Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
427 |
---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
428 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 |
$ hg init $TESTTMP/templates-local-amend-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 |
$ cd $TESTTMP/templates-local-amend-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
431 |
$ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
432 |
$ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
433 |
$ mkcommit B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 |
$ hg amend -m "B1" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
436 |
@ changeset: 3:b7ea6d14e664 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
437 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
438 |
| parent: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
439 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
440 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
441 |
| summary: B1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
442 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
443 |
| x changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
444 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
445 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
446 |
| summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
447 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
448 |
o changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
449 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
450 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
451 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
452 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
453 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
454 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
455 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
456 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
457 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
458 |
$ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
459 |
2 changesets folded |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
460 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
461 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
462 |
@ changeset: 4:eb5a0daa2192 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
463 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
464 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
465 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
466 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
467 |
| summary: C0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 |
| x changeset: 3:b7ea6d14e664 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
470 |
| | parent: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
471 |
| | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
472 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 |
| | summary: B1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 |
| | x changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 |
| |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 |
| | summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 |
| x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
485 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
487 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
490 |
Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
491 |
--------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
492 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
493 |
$ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
495 |
working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
496 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
497 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
498 |
o eb5a0daa2192 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
499 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 |
| @ 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
501 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
502 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
503 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
504 |
$ hg up 'desc(B0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
505 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
506 |
working directory parent is obsolete! (0dec01379d3b) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
507 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
508 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
509 |
o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
510 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
511 |
| @ 0dec01379d3b Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
513 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
514 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
515 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
516 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
517 |
$ hg up 'desc(B1)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
518 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
519 |
working directory parent is obsolete! (b7ea6d14e664) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
520 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
521 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
522 |
o eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
523 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
524 |
| @ b7ea6d14e664 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
525 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
526 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
527 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
528 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
529 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
530 |
$ hg up 'desc(C0)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
531 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
532 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
533 |
@ eb5a0daa2192 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
534 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
535 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
536 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
537 |
$ hg tlog --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
538 |
@ eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
540 |
| x b7ea6d14e664 Precursors: 0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
541 |
| | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
542 |
| | x 0dec01379d3b Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
543 |
| |/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
545 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
546 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
547 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
548 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
549 |
Test template with pushed and pulled obs markers |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
550 |
============================================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
551 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 |
Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
553 |
---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
554 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
555 |
$ hg init $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
556 |
$ cd $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
557 |
$ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
558 |
$ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
559 |
$ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
560 |
updating to branch default |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
561 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
562 |
$ cd $TESTTMP/templates-local-remote-markers-2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
563 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
564 |
@ changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
565 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
566 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
567 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
568 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
573 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
574 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
575 |
$ cd $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
576 |
$ hg amend -m "A1" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
577 |
$ hg amend -m "A2" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
578 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
579 |
@ changeset: 3:7a230b46bf61 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
580 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
581 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
582 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
583 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
584 |
| summary: A2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
585 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
586 |
| x changeset: 2:fdf9bde5129a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
587 |
|/ parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
588 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
589 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
590 |
| summary: A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
591 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
592 |
| x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
593 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
594 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
595 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
596 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
597 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
598 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
599 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
600 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
601 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
602 |
$ cd $TESTTMP/templates-local-remote-markers-2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
603 |
$ hg pull |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
604 |
pulling from $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
605 |
searching for changes |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
606 |
adding changesets |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
607 |
adding manifests |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
608 |
adding file changes |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
609 |
added 1 changesets with 0 changes to 1 files (+1 heads) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
610 |
2 new obsolescence markers |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
611 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
612 |
working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
613 |
(use 'hg evolve' to update to its successor: 7a230b46bf61) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
614 |
$ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
615 |
o changeset: 2:7a230b46bf61 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
616 |
| tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
617 |
| parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
618 |
| user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
619 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
620 |
| summary: A2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
621 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
622 |
| @ changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
623 |
|/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
624 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
625 |
| summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
626 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
627 |
o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
628 |
user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
629 |
date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
630 |
summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
631 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
632 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
633 |
Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
634 |
--------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
635 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
636 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
637 |
o 7a230b46bf61 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
638 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
639 |
| @ 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
640 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
641 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
642 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
643 |
$ hg up 'desc(A2)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
644 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
645 |
$ hg tlog |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
646 |
@ 7a230b46bf61 Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
647 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
648 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
649 |
|
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
650 |
$ hg tlog --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
651 |
@ 7a230b46bf61 Precursors: 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
652 |
| |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
653 |
| x 471f378eab4c Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
654 |
|/ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
655 |
o ea207398892e Precursors: |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
656 |
|