tests/test-bookmarks-strip.t
author Martin Geisler <mg@lazybytes.net>
Wed, 27 Oct 2010 12:05:37 +0200
branchstable
changeset 12857 a9f91c844a3b
parent 12640 6cc4b14fb76b
child 13307 7f2b8aac7bdc
permissions -rw-r--r--
README: add small introduction
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
     1
  $ echo "[extensions]" >> $HGRCPATH
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
     2
  $ echo "bookmarks=" >> $HGRCPATH
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
     3
  $ echo "mq=" >> $HGRCPATH
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
     4
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
     5
  $ hg init
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
     6
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
     7
  $ echo qqq>qqq.txt
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
     8
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
     9
add file
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    10
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    11
  $ hg add
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    12
  adding qqq.txt
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    13
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    14
commit first revision
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    15
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11907
diff changeset
    16
  $ hg ci -m 1
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    17
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    18
set bookmark
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    19
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    20
  $ hg book test
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    21
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    22
  $ echo www>>qqq.txt
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    23
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    24
commit second revision
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    25
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11907
diff changeset
    26
  $ hg ci -m 2
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    27
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    28
set bookmark
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    29
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    30
  $ hg book test2
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    31
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    32
update to -2
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    33
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    34
  $ hg update -r -2
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    35
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    36
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    37
  $ echo eee>>qqq.txt
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    38
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    39
commit new head
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    40
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11907
diff changeset
    41
  $ hg ci -m 3
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    42
  created new head
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    43
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    44
bookmarks updated?
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    45
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    46
  $ hg book
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11907
diff changeset
    47
     test                      1:25e1ee7a0081
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11907
diff changeset
    48
     test2                     1:25e1ee7a0081
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    49
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    50
strip to revision 1
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    51
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11864
diff changeset
    52
  $ hg strip 1
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12394
diff changeset
    53
  saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    54
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    55
list bookmarks
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    56
11864
b2a06ef53b7b tests: unify test-bookmarks-strip
Martin Geisler <mg@lazybytes.net>
parents: 11208
diff changeset
    57
  $ hg book
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11907
diff changeset
    58
   * test                      1:8cf31af87a2b
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11907
diff changeset
    59
   * test2                     1:8cf31af87a2b
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    60
12394
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    61
immediate rollback and reentrancy issue
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    62
12394
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    63
  $ echo "mq=!" >> $HGRCPATH
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    64
  $ hg init repo
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    65
  $ cd repo
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    66
  $ echo a > a
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    67
  $ hg ci -Am adda
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    68
  adding a
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    69
  $ echo b > b
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    70
  $ hg ci -Am addb
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    71
  adding b
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    72
  $ hg bookmarks markb
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    73
  $ hg rollback
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    74
  rolling back to revision 0 (undo commit)
7316
9737041646bc bookmarks: Use dirstate to determine the current node in addchangegroup
David Soria Parra <dsp@php.net>
parents:
diff changeset
    75
12394
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    76
are you there?
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    77
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    78
  $ hg bookmarks
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    79
  no bookmarks set
12392
741290486877 bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016)
Patrick Mezard <pmezard@gmail.com>
parents: 11208
diff changeset
    80
12394
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    81
can you be added again?
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    82
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    83
  $ hg bookmarks markb
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    84
  $ hg bookmarks
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    85
   * markb                     0:07f494440405
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    86
  $ cd ..
9d45f78c465b Merge with stable
Patrick Mezard <pmezard@gmail.com>
parents: 12392 12376
diff changeset
    87