tests/test-prev-next.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Mon, 11 Dec 2017 18:30:15 +0100
branchmercurial-4.1
changeset 3289 bd99cb54712b
parent 3275 875de4816c5b
parent 3287 4303a46b4167
child 3593 b92114f201c9
permissions -rw-r--r--
test-compat: merge mercurial-4.2 into mercurial-4.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
     2
  > [extensions]
2423
677dfbb8bdbf test: enforce color to be enabled
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 1806
diff changeset
     3
  > color =
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
     4
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1756
diff changeset
     5
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
     6
3196
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
     7
hg prev & next move to parent/child
2737
66278c4d9c07 prev: stop creating a repository at the root of 'test-repo.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2443
diff changeset
     8
  $ hg init test-repo
66278c4d9c07 prev: stop creating a repository at the root of 'test-repo.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2443
diff changeset
     9
  $ cd test-repo
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    10
  $ touch a
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    11
  $ hg add a
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    12
  $ hg commit -m 'added a'
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    13
  $ touch b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    14
  $ hg add b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    15
  $ hg commit -m 'added b'
3196
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    16
  $ hg prev
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    17
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    18
  [0] added a
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    19
  $ hg next
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    20
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    21
  [1] added b
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    22
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    23
hg prev & next respect --quiet
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    24
  $ hg prev -q
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    25
  $ hg next -q
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    26
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    27
hg prev -B should move active bookmark
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    28
  $ hg bookmark mark
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    29
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    30
   * mark                      1:6e742c9127b3
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    31
  $ hg prev -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    32
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    33
  [0] added a
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    34
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    35
   * mark                      0:a154386e50d1
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    36
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    37
hg next -B should move active bookmark
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    38
  $ hg next -B --dry-run
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    39
  hg update 1;
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    40
  hg bookmark mark -r 1;
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    41
  [1] added b
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    42
  $ hg next -B
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    43
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    44
  [1] added b
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    45
  $ hg bookmarks
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    46
   * mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    47
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    48
hg prev should unset active bookmark
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    49
  $ hg prev --dry-run
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    50
  hg update 0;
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    51
  [0] added a
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    52
  $ hg prev
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    53
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    54
  [0] added a
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    55
  $ hg bookmarks
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    56
     mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    57
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    58
hg next should move active bookmark
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    59
  $ hg bookmark mark2
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    60
  $ hg bookmarks
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    61
     mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    62
   * mark2                     0:a154386e50d1
2396
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
    63
  $ hg next --dry-run --color=debug
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
    64
  hg update 1;
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
    65
  [[evolve.rev|1]] added b
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    66
  $ hg next
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    67
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    68
  [1] added b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    69
  $ hg bookmarks
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    70
     mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    71
     mark2                     0:a154386e50d1
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    72
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    73
  $ hg bookmark -d mark2
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    74
  $ hg bookmark mark
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    75
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    76
hg next/prev should not interfere with inactive bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    77
  $ touch c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    78
  $ hg add c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    79
  $ hg commit -m 'added c'
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    80
  $ hg bookmark -r2 no-move
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    81
  $ hg prev -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    82
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    83
  [1] added b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    84
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    85
   * mark                      1:6e742c9127b3
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    86
     no-move                   2:4e26ef31f919
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    87
  $ hg next -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    88
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    89
  [2] added c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    90
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    91
   * mark                      2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    92
     no-move                   2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    93
  $ hg up 1
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    94
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
964
c768f7666106 test: update to output change introduced by future 3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 892
diff changeset
    95
  (leaving bookmark mark)
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    96
  $ hg next -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    97
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    98
  [2] added c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    99
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   100
     mark                      2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   101
     no-move                   2:4e26ef31f919
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
   102
  $ hg prev -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   103
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   104
  [1] added b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   105
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   106
     mark                      2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   107
     no-move                   2:4e26ef31f919
1427
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   108
2738
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   109
test prev on root
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   110
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   111
  $ hg up null
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   112
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   113
  $ hg prev
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   114
  already at repository root
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   115
  [1]
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   116
  $ hg up 1
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   117
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1427
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   118
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   119
Behavior with local modification
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   120
--------------------------------
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   121
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   122
  $ echo foo > modified-bar
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   123
  $ hg add modified-bar
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   124
  $ hg prev
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   125
  abort: uncommitted changes
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   126
  (do you want --merge?)
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   127
  [255]
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   128
  $ hg prev --merge
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   129
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   130
  [0] added a
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   131
  $ hg next
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   132
  abort: uncommitted changes
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   133
  (do you want --merge?)
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   134
  [255]
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   135
  $ hg next --merge
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   136
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   137
  [1] added b
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   138
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   139
Behavior with aspiring children
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   140
-------------------------------
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   141
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   142
  $ hg revert --all
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   143
  forgetting modified-bar
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   144
  $ hg log -G
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   145
  o  changeset:   2:4e26ef31f919
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   146
  |  bookmark:    mark
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   147
  |  bookmark:    no-move
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   148
  |  tag:         tip
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   149
  |  user:        test
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   150
  |  date:        Thu Jan 01 00:00:00 1970 +0000
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   151
  |  summary:     added c
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   152
  |
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   153
  @  changeset:   1:6e742c9127b3
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   154
  |  user:        test
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   155
  |  date:        Thu Jan 01 00:00:00 1970 +0000
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   156
  |  summary:     added b
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   157
  |
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   158
  o  changeset:   0:a154386e50d1
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   159
     user:        test
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   160
     date:        Thu Jan 01 00:00:00 1970 +0000
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   161
     summary:     added a
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   162
  
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   163
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   164
no children of any kind
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   165
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   166
  $ hg next
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   167
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   168
  [2] added c
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   169
  $ hg next
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1445
diff changeset
   170
  no children
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   171
  [1]
1487
ee5391999f2d next: properly report no children when --evolve is used
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1449
diff changeset
   172
  $ hg next --evolve
ee5391999f2d next: properly report no children when --evolve is used
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1449
diff changeset
   173
  no children
ee5391999f2d next: properly report no children when --evolve is used
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1449
diff changeset
   174
  [1]
2396
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
   175
  $ hg prev --dry-run --color=debug
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
   176
  hg update 1;
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
   177
  [[evolve.rev|1]] added b
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   178
  $ hg prev
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   179
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   180
  [1] added b
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   181
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   182
some aspiring children
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   183
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   184
  $ hg amend -m 'added b (2)'
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3013
diff changeset
   185
  1 new unstable changesets
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   186
  $ hg next
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1445
diff changeset
   187
  no children
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   188
  (1 unstable changesets to be evolved here, do you want --evolve?)
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   189
  [1]
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   190
  $ hg next --evolve --dry-run
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   191
  move:[2] added c
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   192
  atop:[3] added b (2)
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   193
  hg rebase -r 4e26ef31f919 -d 9ad178109a19
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   194
  working directory now at 9ad178109a19
2443
6a23a55f77d2 next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2396
diff changeset
   195
6a23a55f77d2 next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2396
diff changeset
   196
(add color output for smoke testing)
6a23a55f77d2 next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2396
diff changeset
   197
6a23a55f77d2 next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2396
diff changeset
   198
  $ hg next --evolve --color debug
6a23a55f77d2 next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2396
diff changeset
   199
  move:[[evolve.rev|2]] added c
6a23a55f77d2 next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2396
diff changeset
   200
  atop:[[evolve.rev|3]] added b (2)
6a23a55f77d2 next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2396
diff changeset
   201
  [ ui.status|working directory now at [evolve.node|e3b6d5df389b]]
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   202
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   203
next with ambiguity
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   204
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   205
  $ hg prev
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   206
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   207
  [3] added b (2)
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   208
  $ echo d > d
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   209
  $ hg add d
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   210
  $ hg commit -m 'added d'
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   211
  created new head
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   212
  $ hg prev
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   213
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   214
  [3] added b (2)
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   215
  $ hg next
3225
28fb347a5bf8 typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents: 3196
diff changeset
   216
  ambiguous next changeset:
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   217
  [4] added c
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   218
  [5] added d
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1445
diff changeset
   219
  explicitly update to one of them
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   220
  [1]
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   221
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   222
next with ambiguity in aspiring children
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   223
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   224
  $ hg am -m 'added b (3)'
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3013
diff changeset
   225
  2 new unstable changesets
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   226
  $ hg next
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1445
diff changeset
   227
  no children
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   228
  (2 unstable changesets to be evolved here, do you want --evolve?)
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   229
  [1]
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   230
  $ hg next --evolve
3225
28fb347a5bf8 typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents: 3196
diff changeset
   231
  ambiguous next (unstable) changeset:
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   232
  [4] added c
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   233
  [5] added d
1756
a7dcfff8c4a9 evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents: 1743
diff changeset
   234
  (run 'hg evolve --rev REV' on one of them)
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   235
  [1]
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   236
  $ hg evolve -r 5
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   237
  move:[5] added d
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   238
  atop:[6] added b (3)
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   239
  working directory is now at 47ea25be8aea
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   240
2737
66278c4d9c07 prev: stop creating a repository at the root of 'test-repo.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2443
diff changeset
   241
  $ cd ..
66278c4d9c07 prev: stop creating a repository at the root of 'test-repo.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2443
diff changeset
   242
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   243
prev and next should lock properly against other commands
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   244
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   245
  $ hg init repo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   246
  $ cd repo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   247
  $ HGEDITOR=${TESTDIR}/fake-editor.sh
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   248
  $ echo hi > foo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   249
  $ hg ci -Am 'one'
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   250
  adding foo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   251
  $ echo bye > foo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   252
  $ hg ci -Am 'two'
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   253
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   254
  $ hg amend --edit &
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   255
  $ sleep 1
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   256
  $ hg prev
1743
299cdaa24fa5 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1742
diff changeset
   257
  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   258
  got lock after [4-6] seconds (re)
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   259
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   260
  [0] one
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   261
  $ wait
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   262
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   263
  $ hg amend --edit &
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   264
  $ sleep 1
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   265
  $ hg next --evolve
1743
299cdaa24fa5 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1742
diff changeset
   266
  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3013
diff changeset
   267
  1 new unstable changesets
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   268
  got lock after [4-6] seconds (re)
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   269
  move:[2] two
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   270
  atop:[3] one
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   271
  working directory now at a7d885c75614
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   272
  $ wait