Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags.out @ 2314:e9b5749e4de3
Remove quotes from patch command.
When the gpatch fix for solaris was introduced in 67a0a3852024 the
patch command was "". For some strange reason windows 2000 is
not happy with those quotes when given in os.popen.
author | Volker Kleinfeld <Volker.Kleinfeld@gmx.de> |
---|---|
date | Thu, 18 May 2006 22:35:41 -0700 |
parents | b2ae81a7df29 |
children | 455109df3669 966632304dde |
rev | line source |
---|---|
412 | 1 pulling from ../test1 |
2 requesting all changes | |
3 adding changesets | |
4 adding manifests | |
775 | 5 adding file changes |
6 added 1 changesets with 2 changes to 2 files | |
412 | 7 (run 'hg update' to get a working copy) |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
412 | 9 pulling from ../test2 |
10 searching for changes | |
11 adding changesets | |
12 adding manifests | |
775 | 13 adding file changes |
1043 | 14 added 1 changesets with 1 changes to 1 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
15 (run 'hg heads' to see heads, 'hg merge' to merge) |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
16 changeset: 2:b833d578451e |
412 | 17 tag: tip |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
18 parent: 0:4536b1c2ca69 |
412 | 19 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
20 date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 21 summary: chmod +x a |
22 | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
23 changeset: 1:a187cb361a5a |
412 | 24 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
25 date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 26 summary: a updated |
27 | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
28 changeset: 2:b833d578451e |
412 | 29 tag: tip |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
30 parent: 0:4536b1c2ca69 |
412 | 31 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
32 date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 33 summary: chmod +x a |
34 | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
35 changeset: 1:a187cb361a5a |
412 | 36 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
37 date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 38 summary: a updated |
39 | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
40 changeset: 0:4536b1c2ca69 |
412 | 41 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
42 date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 43 summary: added a b |
44 | |
45 resolving manifests | |
46 merging a | |
47 resolving a | |
1922
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
48 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
49 (branch merge, don't forget to commit) |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
50 -rwxr-x--- |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
51 -rwxr-x--- |