tests/test-flags.out
author mpm@selenic.com
Wed, 27 Jul 2005 18:16:20 -0800
changeset 785 46a8dd3145cc
parent 784 853bfbf1a312
child 793 445970ccf57a
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Fix undo after aborted commit bug Commit would overwrite undo.dirstate unconditionally, so an undo after an aborted commit would restore the dirstate from the aborted commit and not the prior transaction. This copies dirstate to journal.dirstate and moves it after a successful transaction.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
     1
+ umask 027
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
     2
+ mkdir test1
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
     3
+ cd test1
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
     4
+ hg init
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
     5
+ touch a b
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
     6
+ hg add a b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 705
diff changeset
     7
+ hg ci -m 'added a b' -d '0 0'
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
     8
+ cd ..
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
     9
+ mkdir test2
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    10
+ cd test2
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    11
+ hg init
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    12
+ hg pull ../test1
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    13
pulling from ../test1
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    14
requesting all changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    15
adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    16
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
    17
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
    18
added 1 changesets with 2 changes to 2 files
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    19
(run 'hg update' to get a working copy)
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
    20
+ hg co
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    21
+ chmod +x a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 705
diff changeset
    22
+ hg ci -m 'chmod +x a' -d '0 0'
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
    23
+ cd ../test1
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    24
+ echo 123
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 705
diff changeset
    25
+ hg ci -m 'a updated' -d '0 0'
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
    26
+ hg pull ../test2
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    27
pulling from ../test2
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    28
searching for changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    29
adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    30
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
    31
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
    32
added 1 changesets with 1 changes to 1 files
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    33
(run 'hg update' to get a working copy)
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
    34
+ hg heads
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
    35
changeset:   2:3ef543305655
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    36
tag:         tip
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
    37
parent:      0:22a449e20da5
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    38
user:        test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    39
date:        Thu Jan  1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    40
summary:     chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    41
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
    42
changeset:   1:c6ecefc45368
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    43
user:        test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    44
date:        Thu Jan  1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    45
summary:     a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    46
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
    47
+ hg history
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
    48
changeset:   2:3ef543305655
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    49
tag:         tip
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
    50
parent:      0:22a449e20da5
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    51
user:        test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    52
date:        Thu Jan  1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    53
summary:     chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    54
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
    55
changeset:   1:c6ecefc45368
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    56
user:        test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    57
date:        Thu Jan  1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    58
summary:     a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    59
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
    60
changeset:   0:22a449e20da5
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    61
user:        test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    62
date:        Thu Jan  1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    63
summary:     added a b
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    64
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 495
diff changeset
    65
+ hg -v co -m
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    66
resolving manifests
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    67
merging a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    68
resolving a
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
    69
+ ls -l ../test1/a ../test2/a
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    70
+ cut -b 0-10
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    71
-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
    72
-rwxr-x---