author | Christian Ebert <blacktrash@gmx.net> |
Thu, 01 Oct 2009 13:39:15 +0200 | |
changeset 654 | e188e35ff4ad |
parent 653 | f4b2fe9d23df |
child 657 | fcd29bd314be |
permissions | -rw-r--r-- |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1 |
% hg kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
2 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
3 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
4 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
5 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
6 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
7 |
RCSFile = {file|basename},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
8 |
Author = {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
9 |
Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
10 |
Source = {root}/{file},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
11 |
Date = {date|utcdate} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
12 |
Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
13 |
Revision = {node|short} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
14 |
$RCSFile: demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
15 |
$Author: test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
16 |
$Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
17 |
$Source: /TMP/demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
18 |
$Date: 2000/00/00 00:00:00 $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
19 |
$Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
20 |
$Revision: xxxxxxxxxxxx $ |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
21 |
[extensions] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
22 |
hgext.keyword = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
23 |
[keyword] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
24 |
demo.txt = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
25 |
[keywordmaps] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
26 |
Branch = {branches} |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
27 |
$Branch: demobranch $ |
250
b28a2832cba4
Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
249
diff
changeset
|
28 |
% kwshrink should exit silently in empty/invalid repo |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
29 |
pulling from test-keyword.hg |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
30 |
requesting all changes |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
31 |
adding changesets |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
32 |
adding manifests |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
33 |
adding file changes |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
34 |
added 1 changesets with 1 changes to 1 files |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
35 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
36 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
37 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
38 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
39 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
40 |
ignore $Id$ |
653
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
41 |
% no kwfiles |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
42 |
% untracked candidates |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
43 |
k a |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
44 |
% addremove |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
45 |
adding a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
46 |
adding b |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
47 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
48 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
49 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
50 |
% default keyword expansion including commit hook |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
51 |
% interrupted commit should not change state or run commit hook |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
52 |
abort: empty commit message |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
53 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
54 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
55 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
56 |
% commit |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
57 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
58 |
b |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
59 |
overwriting a expanding keywords |
294 | 60 |
running hook commit.test: cp a hooktest |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
61 |
committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
62 |
% status |
294 | 63 |
? hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
64 |
% identify |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
65 |
ef63ca68695b |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
66 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
67 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
68 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
69 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
70 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
71 |
% hg cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
72 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
73 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
74 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
75 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
76 |
a |
294 | 77 |
% diff a hooktest |
78 |
% removing commit hook from config |
|
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
79 |
% bundle |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
80 |
2 changesets found |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
81 |
% notify on pull to check whether keywords stay as is in email |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
82 |
% ie. if patch.diff wrapper acts as it should |
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
83 |
% pull from bundle |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
84 |
pulling from ../kw.hg |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
85 |
requesting all changes |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
86 |
adding changesets |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
87 |
adding manifests |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
88 |
adding file changes |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
89 |
added 2 changesets with 3 changes to 3 files |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
90 |
|
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
91 |
diff -r 000000000000 -r a2392c293916 sym |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
92 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
93 |
+++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
94 |
@@ -0,0 +1,1 @@ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
95 |
+a |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
96 |
\ No newline at end of file |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
97 |
|
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
98 |
diff -r a2392c293916 -r ef63ca68695b a |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
99 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
100 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
101 |
@@ -0,0 +1,3 @@ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
102 |
+expand $Id$ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
103 |
+do not process $Id: |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
104 |
+xxx $ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
105 |
diff -r a2392c293916 -r ef63ca68695b b |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
106 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
107 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
108 |
@@ -0,0 +1,1 @@ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
109 |
+ignore $Id$ |
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
110 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
111 |
% remove notify config |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
112 |
% touch |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
113 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
114 |
% update |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
115 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
116 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
117 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
118 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
119 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
120 |
ignore $Id$ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
121 |
% check whether expansion is filewise |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
122 |
% commit c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
123 |
adding c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
124 |
% force expansion |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
125 |
overwriting a expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
126 |
overwriting c expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
127 |
% compare changenodes in a c |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
128 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
129 |
do not process $Id: |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
130 |
xxx $ |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
131 |
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
132 |
tests for different changenodes |
381
17e94f77de6a
Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents:
378
diff
changeset
|
133 |
% qinit -c |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
134 |
% qimport |
381
17e94f77de6a
Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents:
378
diff
changeset
|
135 |
% qcommit |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
136 |
% keywords should not be expanded in patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
137 |
# HG changeset patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
138 |
# User User Name <user@example.com> |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
139 |
# Date 1 0 |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
140 |
# Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
141 |
# Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
142 |
cndiff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
143 |
|
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
144 |
diff -r ef63ca68695b -r 40a904bbbe4c c |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
145 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
146 |
+++ b/c Thu Jan 01 00:00:01 1970 +0000 |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
147 |
@@ -0,0 +1,2 @@ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
148 |
+$Id$ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
149 |
+tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
150 |
% qpop |
618
f9e8e4992b7e
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
614
diff
changeset
|
151 |
popping mqtest.diff |
520 | 152 |
patch queue now empty |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
153 |
% qgoto - should imply qpush |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
154 |
applying mqtest.diff |
520 | 155 |
now at: mqtest.diff |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
156 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
157 |
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
158 |
tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
159 |
% qpop and move on |
618
f9e8e4992b7e
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
614
diff
changeset
|
160 |
popping mqtest.diff |
520 | 161 |
patch queue now empty |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
162 |
% copy |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
163 |
% kwfiles added |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
164 |
a |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
165 |
c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
166 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
167 |
c |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
168 |
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
169 |
overwriting c expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
170 |
committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
171 |
% cat a c |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
172 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
173 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
174 |
xxx $ |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
175 |
expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
176 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
177 |
xxx $ |
426
671d2e27d388
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
409
diff
changeset
|
178 |
% touch copied c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
179 |
% status |
247 | 180 |
% kwfiles |
181 |
a |
|
182 |
c |
|
653
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
183 |
% ignored files |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
184 |
I b |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
185 |
I sym |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
186 |
% all files |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
187 |
K a |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
188 |
K c |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
189 |
I b |
f4b2fe9d23df
Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
649
diff
changeset
|
190 |
I sym |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
191 |
% diff --rev |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
192 |
diff -r ef63ca68695b c |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
193 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
194 |
@@ -0,0 +1,3 @@ |
341
5ef2b11df3d3
Avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
340
diff
changeset
|
195 |
+expand $Id$ |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
196 |
+do not process $Id: |
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
197 |
+xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
198 |
% rollback |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
199 |
rolling back last transaction |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
200 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
201 |
A c |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
202 |
% update -C |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
203 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
204 |
% custom keyword expansion |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
205 |
% try with kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
206 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
207 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
208 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
209 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
210 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
211 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
212 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
213 |
Xinfo = {author}: {desc} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
214 |
$Xinfo: test: hg keyword config and expansion example $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
215 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
216 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
217 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
218 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
219 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
220 |
% hg cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
221 |
expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
222 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
223 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
224 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
225 |
a |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
226 |
% interrupted commit should not change state |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
227 |
abort: empty commit message |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
228 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
229 |
M a |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
230 |
? c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
231 |
? log |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
232 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
233 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
234 |
overwriting a expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
235 |
committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
236 |
% status |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
237 |
? c |
479
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
238 |
% verify |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
239 |
checking changesets |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
240 |
checking manifests |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
241 |
crosschecking files in changesets and manifests |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
242 |
checking files |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
243 |
3 files, 3 changesets, 4 total revisions |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
244 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
245 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
246 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
247 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
248 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
249 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
250 |
% hg cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
251 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
252 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
253 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
254 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
255 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
256 |
a |
463
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
257 |
% annotate |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
258 |
1: expand $Id$ |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
259 |
1: do not process $Id: |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
260 |
1: xxx $ |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
261 |
2: $Xinfo$ |
215 | 262 |
% remove |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
263 |
committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
215 | 264 |
% status |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
265 |
? c |
215 | 266 |
% rollback |
267 |
rolling back last transaction |
|
268 |
% status |
|
269 |
R a |
|
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
270 |
? c |
215 | 271 |
% revert a |
272 |
% cat a |
|
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
273 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
274 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
275 |
xxx $ |
215 | 276 |
$Xinfo: User Name <user@example.com>: firstline $ |
277 |
% clone to test incoming |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
278 |
requesting all changes |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
279 |
adding changesets |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
280 |
adding manifests |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
281 |
adding file changes |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
282 |
added 2 changesets with 3 changes to 3 files |
427
39fef460b62c
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
426
diff
changeset
|
283 |
updating working directory |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
284 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
285 |
% incoming |
362
3ea0cbaf3535
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
342
diff
changeset
|
286 |
comparing with test-keyword/Test |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
287 |
searching for changes |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
288 |
changeset: 2:bb948857c743 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
289 |
tag: tip |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
290 |
user: User Name <user@example.com> |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
291 |
date: Thu Jan 01 00:00:02 1970 +0000 |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
292 |
summary: firstline |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
293 |
|
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
294 |
% commit rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
295 |
a |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
296 |
overwriting a expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
297 |
committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
298 |
% export |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
299 |
% import |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
300 |
applying ../rejecttest.diff |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
301 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
302 |
expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
303 |
do not process $Id: rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
304 |
xxx $ |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
305 |
$Xinfo: User Name <user@example.com>: rejects? $ |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
306 |
ignore $Id$ |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
307 |
|
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
308 |
% rollback |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
309 |
rolling back last transaction |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
310 |
% clean update |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
311 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
312 |
% kwexpand/kwshrink on selected files |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
313 |
% copy a x/a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
314 |
% kwexpand a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
315 |
overwriting a expanding keywords |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
316 |
% kwexpand x/a should abort |
465
2f017ca736ce
(stable) mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
463
diff
changeset
|
317 |
abort: outstanding uncommitted changes |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
318 |
x/a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
319 |
x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
320 |
overwriting x/a expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
321 |
committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
322 |
% cat a |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
323 |
expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
324 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
325 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
326 |
$Xinfo: User Name <user@example.com>: xa $ |
281
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
327 |
% kwshrink a inside directory x |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
328 |
overwriting x/a shrinking keywords |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
329 |
% cat a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
330 |
expand $Id$ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
331 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
332 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
333 |
$Xinfo$ |
279
1f00dce8de12
Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents:
267
diff
changeset
|
334 |
% kwexpand nonexistent |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
335 |
nonexistent: |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
336 |
% hg serve |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
337 |
% expansion |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
338 |
% hgweb file |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
339 |
200 Script output follows |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
340 |
|
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
341 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
342 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
343 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
344 |
$Xinfo: User Name <user@example.com>: firstline $ |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
345 |
% no expansion |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
346 |
% hgweb annotate |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
347 |
200 Script output follows |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
348 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
349 |
|
493
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
350 |
user@1: expand $Id$ |
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
351 |
user@1: do not process $Id: |
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
352 |
user@1: xxx $ |
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
353 |
user@2: $Xinfo$ |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
354 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
355 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
356 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
357 |
|
429
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
358 |
% hgweb changeset |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
359 |
200 Script output follows |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
360 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
361 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
362 |
# HG changeset patch |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
363 |
# User User Name <user@example.com> |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
364 |
# Date 3 0 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
365 |
# Node ID cfa68229c1167443337266ebac453c73b1d5d16e |
512
7d0a5e7b279d
hgweb: nodeids should be aligned in raw changesets
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
498
diff
changeset
|
366 |
# Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
429
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
367 |
xa |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
368 |
|
641
bf971e786e93
test-keyword: update output to match 5d49fdef6fd0
Martin Geisler <mg@lazybytes.net>
parents:
634
diff
changeset
|
369 |
diff -r bb948857c743 -r cfa68229c116 x/a |
429
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
370 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
371 |
+++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
372 |
@@ -0,0 +1,4 @@ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
373 |
+expand $Id$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
374 |
+do not process $Id: |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
375 |
+xxx $ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
376 |
+$Xinfo$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
377 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
378 |
% hgweb filediff |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
379 |
200 Script output follows |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
380 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
381 |
|
641
bf971e786e93
test-keyword: update output to match 5d49fdef6fd0
Martin Geisler <mg@lazybytes.net>
parents:
634
diff
changeset
|
382 |
diff -r ef63ca68695b -r bb948857c743 a |
429
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
383 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
384 |
+++ b/a Thu Jan 01 00:00:02 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
385 |
@@ -1,3 +1,4 @@ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
386 |
expand $Id$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
387 |
do not process $Id: |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
388 |
xxx $ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
389 |
+$Xinfo$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
390 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
391 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
392 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
393 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
394 |
% errors encountered |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
395 |
% merge/resolve |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
396 |
% simplemerge |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
397 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
398 |
created new head |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
399 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
400 |
(branch merge, don't forget to commit) |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
401 |
$Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
402 |
foo |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
403 |
% conflict |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
404 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
405 |
created new head |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
406 |
merging m |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
407 |
warning: conflicts during merge. |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
408 |
merging m failed! |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
409 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
649
c01143cef2c7
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
643
diff
changeset
|
410 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
411 |
% keyword stays outside conflict zone |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
412 |
$Id$ |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
413 |
<<<<<<< local |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
414 |
bar |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
415 |
======= |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
416 |
foo |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
417 |
>>>>>>> other |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
418 |
% resolve to local |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
419 |
$Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
420 |
bar |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
421 |
% switch off expansion |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
422 |
% kwshrink with unknown file u |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
423 |
overwriting a shrinking keywords |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
424 |
overwriting m shrinking keywords |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
425 |
overwriting x/a shrinking keywords |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
426 |
% cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
427 |
expand $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
428 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
429 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
430 |
$Xinfo$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
431 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
432 |
% hg cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
433 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
434 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
435 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
436 |
$Xinfo: User Name <user@example.com>: firstline $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
437 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
438 |
a |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
439 |
% cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
440 |
expand $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
441 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
442 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
443 |
$Xinfo$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
444 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
445 |
% hg cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
446 |
expand $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
447 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
448 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
449 |
$Xinfo$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
450 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
451 |
a |