Mercurial > hg
annotate tests/test-keyword.out @ 10585:37db57bc7fd7 stable
Merge with hg-i18n
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 04 Mar 2010 10:05:12 +0100 |
parents | 4401b0dfee88 |
children | 9c0a1887bd4b |
rev | line source |
---|---|
5816 | 1 % hg kwdemo |
2 [extensions] | |
10125
19c3fefdaec9
tests highlight, keyword: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents:
10117
diff
changeset
|
3 keyword = |
5816 | 4 [keyword] |
5 demo.txt = | |
6 [keywordmaps] | |
7 Author = {author|user} | |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
8 Date = {date|utcdate} |
5816 | 9 Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
10 Id = {file|basename},v {node|short} {date|utcdate} {author|user} | |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
11 RCSFile = {file|basename},v |
9943
f8d779791161
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net>
parents:
9942
diff
changeset
|
12 RCSfile = {file|basename},v |
5816 | 13 Revision = {node|short} |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
14 Source = {root}/{file},v |
5816 | 15 $Author: test $ |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
16 $Date: 2000/00/00 00:00:00 $ |
5816 | 17 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
18 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
19 $RCSFile: demo.txt,v $ |
9943
f8d779791161
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net>
parents:
9942
diff
changeset
|
20 $RCSfile: demo.txt,v $ |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
21 $Revision: xxxxxxxxxxxx $ |
5816 | 22 $Source: /TMP/demo.txt,v $ |
23 [extensions] | |
10125
19c3fefdaec9
tests highlight, keyword: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents:
10117
diff
changeset
|
24 keyword = |
5816 | 25 [keyword] |
26 demo.txt = | |
27 [keywordmaps] | |
28 Branch = {branches} | |
29 $Branch: demobranch $ | |
30 % kwshrink should exit silently in empty/invalid repo | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
31 pulling from test-keyword.hg |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
32 requesting all changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
33 adding changesets |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
34 adding manifests |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
35 adding file changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
36 added 1 changesets with 1 changes to 1 files |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 38 % cat |
39 expand $Id$ | |
40 do not process $Id: | |
41 xxx $ | |
42 ignore $Id$ | |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
43 % no kwfiles |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
44 % untracked candidates |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
45 k a |
5816 | 46 % addremove |
47 adding a | |
48 adding b | |
49 % status | |
50 A a | |
51 A b | |
52 % default keyword expansion including commit hook | |
53 % interrupted commit should not change state or run commit hook | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
54 abort: empty commit message |
5816 | 55 % status |
56 A a | |
57 A b | |
58 % commit | |
59 a | |
60 b | |
61 overwriting a expanding keywords | |
62 running hook commit.test: cp a hooktest | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
63 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5816 | 64 % status |
65 ? hooktest | |
66 % identify | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
67 ef63ca68695b |
5816 | 68 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
69 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 70 do not process $Id: |
71 xxx $ | |
72 ignore $Id$ | |
73 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
74 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 75 do not process $Id: |
76 xxx $ | |
77 ignore $Id$ | |
78 a | |
79 % diff a hooktest | |
80 % removing commit hook from config | |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
81 % bundle |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
82 2 changesets found |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
83 % notify on pull to check whether keywords stay as is in email |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
84 % ie. if patch.diff wrapper acts as it should |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
85 % pull from bundle |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
86 pulling from ../kw.hg |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
87 requesting all changes |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
88 adding changesets |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
89 adding manifests |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
90 adding file changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
91 added 2 changesets with 3 changes to 3 files |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
92 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
93 diff -r 000000000000 -r a2392c293916 sym |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
94 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
95 +++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
96 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
97 +a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
98 \ No newline at end of file |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
99 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
100 diff -r a2392c293916 -r ef63ca68695b a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
101 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
102 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
103 @@ -0,0 +1,3 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
104 +expand $Id$ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
105 +do not process $Id: |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
106 +xxx $ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
107 diff -r a2392c293916 -r ef63ca68695b b |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
108 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
109 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
110 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
111 +ignore $Id$ |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
112 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
113 % remove notify config |
5816 | 114 % touch |
115 % status | |
116 % update | |
117 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
118 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
119 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 120 do not process $Id: |
121 xxx $ | |
122 ignore $Id$ | |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
123 % check whether expansion is filewise |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
124 % commit c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
125 adding c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
126 % force expansion |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
127 overwriting a expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
128 overwriting c expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
129 % compare changenodes in a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
131 do not process $Id: |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
132 xxx $ |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
133 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
134 tests for different changenodes |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
135 % qinit -c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
136 % qimport |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
137 % qcommit |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
138 % keywords should not be expanded in patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
139 # HG changeset patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
140 # User User Name <user@example.com> |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
141 # Date 1 0 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
142 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
143 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
144 cndiff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
145 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
146 diff -r ef63ca68695b -r 40a904bbbe4c c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
147 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
148 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
149 @@ -0,0 +1,2 @@ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
150 +$Id$ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
151 +tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
152 % qpop |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
9106
diff
changeset
|
153 popping mqtest.diff |
7627 | 154 patch queue now empty |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
155 % qgoto - should imply qpush |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
156 applying mqtest.diff |
7627 | 157 now at: mqtest.diff |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
158 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
159 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
160 tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
161 % qpop and move on |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
9106
diff
changeset
|
162 popping mqtest.diff |
7627 | 163 patch queue now empty |
5816 | 164 % copy |
165 % kwfiles added | |
166 a | |
167 c | |
168 % commit | |
169 c | |
170 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
171 overwriting c expanding keywords | |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
172 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
5816 | 173 % cat a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
174 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 175 do not process $Id: |
176 xxx $ | |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
177 expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ |
5816 | 178 do not process $Id: |
179 xxx $ | |
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6116
diff
changeset
|
180 % touch copied c |
5816 | 181 % status |
182 % kwfiles | |
183 a | |
184 c | |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
185 % ignored files |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
186 I b |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
187 I sym |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
188 % all files |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
189 K a |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
190 K c |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
191 I b |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
192 I sym |
5816 | 193 % diff --rev |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
194 diff -r ef63ca68695b c |
5816 | 195 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
196 @@ -0,0 +1,3 @@ | |
5885
53be157543d4
keyword: avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
5884
diff
changeset
|
197 +expand $Id$ |
5816 | 198 +do not process $Id: |
199 +xxx $ | |
200 % rollback | |
201 rolling back last transaction | |
202 % status | |
203 A c | |
204 % update -C | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
205 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 206 % custom keyword expansion |
207 % try with kwdemo | |
208 [extensions] | |
10125
19c3fefdaec9
tests highlight, keyword: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents:
10117
diff
changeset
|
209 keyword = |
5816 | 210 [keyword] |
211 * = | |
212 b = ignore | |
213 demo.txt = | |
214 [keywordmaps] | |
215 Xinfo = {author}: {desc} | |
10499
4401b0dfee88
keyword: mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net>
parents:
10490
diff
changeset
|
216 $Xinfo: test: hg keyword configuration and expansion example $ |
5816 | 217 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
218 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 219 do not process $Id: |
220 xxx $ | |
221 ignore $Id$ | |
222 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
223 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
5816 | 224 do not process $Id: |
225 xxx $ | |
226 ignore $Id$ | |
227 a | |
228 % interrupted commit should not change state | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
229 abort: empty commit message |
5816 | 230 % status |
231 M a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
232 ? c |
5816 | 233 ? log |
234 % commit | |
235 a | |
236 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
237 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
5816 | 238 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
239 ? c |
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
240 % verify |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
241 checking changesets |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
242 checking manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
243 crosschecking files in changesets and manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
244 checking files |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
245 3 files, 3 changesets, 4 total revisions |
5816 | 246 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
247 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 248 do not process $Id: |
249 xxx $ | |
250 $Xinfo: User Name <user@example.com>: firstline $ | |
251 ignore $Id$ | |
252 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
253 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 254 do not process $Id: |
255 xxx $ | |
256 $Xinfo: User Name <user@example.com>: firstline $ | |
257 ignore $Id$ | |
258 a | |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
259 % annotate |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
260 1: expand $Id$ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
261 1: do not process $Id: |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
262 1: xxx $ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
263 2: $Xinfo$ |
5816 | 264 % remove |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
265 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
5816 | 266 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
267 ? c |
5816 | 268 % rollback |
269 rolling back last transaction | |
270 % status | |
271 R a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
272 ? c |
5816 | 273 % revert a |
274 % cat a | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
275 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 276 do not process $Id: |
277 xxx $ | |
278 $Xinfo: User Name <user@example.com>: firstline $ | |
279 % clone to test incoming | |
280 requesting all changes | |
281 adding changesets | |
282 adding manifests | |
283 adding file changes | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
284 added 2 changesets with 3 changes to 3 files |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
9602
diff
changeset
|
285 updating to branch default |
5816 | 286 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
287 % incoming | |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
5894
diff
changeset
|
288 comparing with test-keyword/Test |
5816 | 289 searching for changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
290 changeset: 2:bb948857c743 |
5816 | 291 tag: tip |
292 user: User Name <user@example.com> | |
293 date: Thu Jan 01 00:00:02 1970 +0000 | |
294 summary: firstline | |
295 | |
296 % commit rejecttest | |
297 a | |
298 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
299 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
5816 | 300 % export |
301 % import | |
302 applying ../rejecttest.diff | |
303 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
304 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
5816 | 305 do not process $Id: rejecttest |
306 xxx $ | |
307 $Xinfo: User Name <user@example.com>: rejects? $ | |
308 ignore $Id$ | |
309 | |
310 % rollback | |
311 rolling back last transaction | |
312 % clean update | |
313 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
314 % kwexpand/kwshrink on selected files | |
315 % copy a x/a | |
316 % kwexpand a | |
317 overwriting a expanding keywords | |
318 % kwexpand x/a should abort | |
6672
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
319 abort: outstanding uncommitted changes |
5816 | 320 x/a |
321 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
322 overwriting x/a expanding keywords | |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
323 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
5816 | 324 % cat a |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
325 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
5816 | 326 do not process $Id: |
327 xxx $ | |
328 $Xinfo: User Name <user@example.com>: xa $ | |
329 % kwshrink a inside directory x | |
330 overwriting x/a shrinking keywords | |
331 % cat a | |
332 expand $Id$ | |
333 do not process $Id: | |
334 xxx $ | |
335 $Xinfo$ | |
336 % kwexpand nonexistent | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
337 nonexistent: |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
338 % hg serve |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
339 % expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
340 % hgweb file |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
341 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
342 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
343 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 344 do not process $Id: |
345 xxx $ | |
346 $Xinfo: User Name <user@example.com>: firstline $ | |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
347 % no expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
348 % hgweb annotate |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
349 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
350 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
351 |
6968
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
352 user@1: expand $Id$ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
353 user@1: do not process $Id: |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
354 user@1: xxx $ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
355 user@2: $Xinfo$ |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
356 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
357 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
358 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
359 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
360 % hgweb changeset |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
361 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
362 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
363 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
364 # HG changeset patch |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
365 # User User Name <user@example.com> |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
366 # Date 3 0 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
367 # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 |
7166
fb3df69aa785
hgweb: nodeids should be aligned in raw changesets
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7127
diff
changeset
|
368 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
369 xa |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
370 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
371 diff -r bb948857c743 -r b4560182a3f9 x/a |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
372 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
373 +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
374 @@ -0,0 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
375 +expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
376 +do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
377 +xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
378 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
379 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
380 % hgweb filediff |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
381 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
382 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
383 |
9403
3738c8cff1bf
test-keyword: update output to match 5d49fdef6fd0
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
384 diff -r ef63ca68695b -r bb948857c743 a |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
385 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
386 +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
387 @@ -1,3 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
388 expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
389 do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
390 xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
391 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
392 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
393 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
394 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
395 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
396 % errors encountered |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
397 % merge/resolve |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
398 % simplemerge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
399 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
400 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
401 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
402 (branch merge, don't forget to commit) |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
403 $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
404 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
405 % conflict |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
406 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
407 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
408 merging m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
409 warning: conflicts during merge. |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
410 merging m failed! |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
411 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
9404
diff
changeset
|
412 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
413 % keyword stays outside conflict zone |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
414 $Id$ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
415 <<<<<<< local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
416 bar |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
417 ======= |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
418 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
419 >>>>>>> other |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
420 % resolve to local |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
421 $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
422 bar |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
423 % test restricted mode with transplant -b |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
424 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
425 marked working directory as branch foo |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
426 created new head |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
427 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
428 applying 4aa30d025d50 |
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
429 4aa30d025d50 transplanted to 5a4da427c162 |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
430 % no expansion in changeset |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
431 changeset: 11:5a4da427c162 |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
432 tag: tip |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
433 parent: 9:41efa6d38e9b |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
434 user: test |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
435 date: Thu Jan 01 00:00:00 1970 +0000 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
436 summary: 9foobranch |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
437 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
438 diff -r 41efa6d38e9b -r 5a4da427c162 a |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
439 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
440 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
441 @@ -1,3 +1,4 @@ |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
442 +foobranch |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
443 expand $Id$ |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
444 do not process $Id: |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
445 xxx $ |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
446 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
447 % expansion in file |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
448 foobranch |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
449 expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
450 % switch off expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
451 % kwshrink with unknown file u |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
452 overwriting a shrinking keywords |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
453 overwriting m shrinking keywords |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
454 overwriting x/a shrinking keywords |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
455 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
456 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
457 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
458 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
459 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
460 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
461 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
462 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
463 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
464 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
465 $Xinfo: User Name <user@example.com>: firstline $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
466 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
467 a |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
468 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
469 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
470 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
471 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
472 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
473 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
474 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
475 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
476 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
477 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
478 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
479 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
480 a |