mercurial-crew-with-dirclash: tests/test-flags.out@0ce3cd330996 (annotated)

412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	1	pulling from ../test1
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	2	requesting all changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	3	adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	4	adding manifests
775 122449dd89db Fix up test results mpm@selenic.com parents: 749 diff changeset	5	adding file changes
122449dd89db Fix up test results mpm@selenic.com parents: 749 diff changeset	6	added 1 changesets with 2 changes to 2 files
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	7	(run 'hg update' to get a working copy)
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	8	pulling from ../test2
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	9	searching for changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	10	adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	11	adding manifests
775 122449dd89db Fix up test results mpm@selenic.com parents: 749 diff changeset	12	adding file changes
1043 9344f5dd4488 Update tests mpm@selenic.com parents: 981 diff changeset	13	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	14	(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	15	changeset: 2:b833d578451e
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	16	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	17	parent: 0:4536b1c2ca69
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	18	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	19	date: Mon Jan 12 13:46:40 1970 +0000
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	20	summary: chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	21
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	22	changeset: 1:a187cb361a5a
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	23	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	24	date: Mon Jan 12 13:46:40 1970 +0000
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	25	summary: a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	26
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	27	changeset: 2:b833d578451e
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	28	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	29	parent: 0:4536b1c2ca69
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	30	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	31	date: Mon Jan 12 13:46:40 1970 +0000
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	32	summary: chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	33
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	34	changeset: 1:a187cb361a5a
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	35	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	36	date: Mon Jan 12 13:46:40 1970 +0000
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	37	summary: a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	38
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	39	changeset: 0:4536b1c2ca69
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	40	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	41	date: Mon Jan 12 13:46:40 1970 +0000
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	42	summary: added a b
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	43
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	44	resolving manifests
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	45	merging a
40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: diff changeset	46	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	47	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	48	(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	49	-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	50	-rwxr-x---

author	Thomas Arendsen Hein <thomas@intevation.de>
	Fri, 28 Apr 2006 12:38:11 +0200
changeset 2151	0ce3cd330996
parent 2019	ced2d3620f95
child 2175	b2ae81a7df29
permissions	-rw-r--r--