tests/test-prev-next.t
author Anton Shestakov <av6@dwimlabs.net>
Sat, 22 Jun 2019 18:37:21 +0800
branchstable
changeset 4698 b89495215c6e
parent 4613 30a544904238
child 4672 653c42af172e
child 4711 88c8ef4d703c
permissions -rw-r--r--
tests: demonstrate prune --pair not moving bookmark correctly After `mkcommit n2` line the bookmark is on the correct changeset, but when we prune --pair the two newly created changesets (revs 13 and 14), the bookmark gets moved to their ancestor (rev 0). Instead, it should've moved to the last of their successors (rev 12).
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
3547
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
     2
  > [ui]
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
     3
  > interactive = True
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
     4
  > [extensions]
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
     5
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1756
diff changeset
     6
  $ 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
     7
3196
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
     8
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
     9
  $ 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
    10
  $ cd test-repo
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    11
  $ touch a
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    12
  $ hg add a
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    13
  $ hg commit -m 'added a'
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    14
  $ touch b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    15
  $ hg add b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    16
  $ 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
    17
  $ hg prev
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    18
  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
    19
  [0] added a
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    20
  $ hg next
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    21
  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
    22
  [1] added b
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    23
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    24
hg prev & next respect --quiet
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    25
  $ hg prev -q
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    26
  $ hg next -q
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    27
94e5235e95f5 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents: 3013
diff changeset
    28
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
    29
  $ hg bookmark mark
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    30
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    31
   * mark                      1:6e742c9127b3
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    32
  $ hg prev -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    33
  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
    34
  [0] added a
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    35
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    36
   * mark                      0:a154386e50d1
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    37
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    38
hg next -B should move active bookmark
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    39
  $ hg next -B --dry-run
3546
d197e6f0d0e3 next: show changeset hash in `--dry-run` instead of rev numbers
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3501
diff changeset
    40
  hg update 6e742c9127b3;
d197e6f0d0e3 next: show changeset hash in `--dry-run` instead of rev numbers
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3501
diff changeset
    41
  hg bookmark mark -r 6e742c9127b3;
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    42
  [1] added b
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    43
  $ hg next -B
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    44
  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
    45
  [1] added b
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    46
  $ hg bookmarks
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    47
   * mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    48
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    49
hg prev should unset active bookmark
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    50
  $ hg prev --dry-run
3552
7e8b2c9edf36 prev: show changeset hash in --dry-run instead of rev numbers
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3551
diff changeset
    51
  hg update a154386e50d1;
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
    52
  [0] added a
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    53
  $ hg prev
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    54
  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
    55
  [0] added a
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    56
  $ hg bookmarks
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    57
     mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    58
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    59
hg next should move active bookmark
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    60
  $ hg bookmark mark2
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    61
  $ hg bookmarks
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    62
     mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    63
   * mark2                     0:a154386e50d1
2396
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
    64
  $ hg next --dry-run --color=debug
3546
d197e6f0d0e3 next: show changeset hash in `--dry-run` instead of rev numbers
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3501
diff changeset
    65
  hg update 6e742c9127b3;
2396
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
    66
  [[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
    67
  $ hg next
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    68
  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
    69
  [1] added b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    70
  $ hg bookmarks
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    71
     mark                      1:6e742c9127b3
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    72
     mark2                     0:a154386e50d1
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    73
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    74
  $ hg bookmark -d mark2
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    75
  $ hg bookmark mark
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    76
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    77
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
    78
  $ touch c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    79
  $ hg add c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    80
  $ hg commit -m 'added c'
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    81
  $ hg bookmark -r2 no-move
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    82
  $ hg prev -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    83
  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
    84
  [1] added b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    85
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    86
   * mark                      1:6e742c9127b3
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    87
     no-move                   2:4e26ef31f919
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    88
  $ hg next -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    89
  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
    90
  [2] added c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    91
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    92
   * mark                      2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    93
     no-move                   2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    94
  $ hg up 1
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    95
  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
    96
  (leaving bookmark mark)
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
    97
  $ hg next -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
    98
  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
    99
  [2] added c
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   100
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   101
     mark                      2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   102
     no-move                   2:4e26ef31f919
1160
e29a813f6af5 Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents: 964
diff changeset
   103
  $ hg prev -B
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   104
  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
   105
  [1] added b
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   106
  $ hg bookmarks
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   107
     mark                      2:4e26ef31f919
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset
   108
     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
   109
2738
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   110
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
   111
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   112
  $ 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
   113
  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
   114
  $ hg prev
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   115
  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
   116
  [1]
3f27fe80be26 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2737
diff changeset
   117
  $ 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
   118
  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
   119
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   120
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
   121
--------------------------------
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   122
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   123
  $ 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
   124
  $ 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
   125
  $ hg prev
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   126
  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
   127
  (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
   128
  [255]
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   129
  $ 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
   130
  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
   131
  [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
   132
  $ hg next
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   133
  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
   134
  (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
   135
  [255]
fcc467ca740e next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   136
  $ 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
   137
  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
   138
  [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
   139
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   140
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
   141
-------------------------------
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   142
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   143
  $ hg revert --all
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   144
  forgetting modified-bar
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   145
  $ hg log -G
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   146
  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
   147
  |  bookmark:    mark
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   148
  |  bookmark:    no-move
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   149
  |  tag:         tip
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   150
  |  user:        test
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   151
  |  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
   152
  |  summary:     added c
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   153
  |
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   154
  @  changeset:   1:6e742c9127b3
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   155
  |  user:        test
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   156
  |  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
   157
  |  summary:     added b
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   158
  |
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   159
  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
   160
     user:        test
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   161
     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
   162
     summary:     added a
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
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   165
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
   166
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   167
  $ hg next
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   168
  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
   169
  [2] added c
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   170
  $ hg next
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1445
diff changeset
   171
  no children
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   172
  [1]
1487
ee5391999f2d next: properly report no children when --evolve is used
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1449
diff changeset
   173
  $ 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
   174
  no children
ee5391999f2d next: properly report no children when --evolve is used
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1449
diff changeset
   175
  [1]
2396
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
   176
  $ hg prev --dry-run --color=debug
3552
7e8b2c9edf36 prev: show changeset hash in --dry-run instead of rev numbers
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3551
diff changeset
   177
  hg update 6e742c9127b3;
2396
c1485ebdd6b9 color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents: 1806
diff changeset
   178
  [[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
   179
  $ hg prev
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   180
  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
   181
  [1] added b
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   182
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   183
some aspiring children
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   184
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   185
  $ hg amend -m 'added b (2)'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   186
  1 new orphan changesets
4237
9e64a7d09895 next: explicitly specify --no-evolve in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4181
diff changeset
   187
  $ hg next --no-evolve
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1445
diff changeset
   188
  no children
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   189
  (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
   190
  [1]
1500
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   191
  $ hg next --evolve --dry-run
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   192
  move:[2] added c
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   193
  atop:[3] added b (2)
b4dfafda72c2 next: add support for --dry-run
timeless@mozdev.org
parents: 1487
diff changeset
   194
  hg rebase -r 4e26ef31f919 -d 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
3501
7c8150697810 color: add some colors to evolve command itself
Boris Feld <boris.feld@octobus.net>
parents: 3488
diff changeset
   199
  [evolve.operation|move:][[evolve.rev|2]] added c
2443
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)
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4576
diff changeset
   201
  [ ui.status|working directory is 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)
3547
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   215
  $ hg next <<EOF
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   216
  > 2
3547
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   217
  > EOF
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   218
  ambiguous next changeset, choose one to update:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   219
  1: [e3b6d5df389b] added c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   220
  2: [9df671ccd2c7] added d
3547
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   221
  q: quit the prompt
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   222
  enter the index of the revision you want to select: 2
3547
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   223
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   224
  [5] added d
3547
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   225
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   226
  $ hg prev
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   227
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
78abffad8626 next: prompt user to choose a children in case of ambiguity
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3546
diff changeset
   228
  [3] added b (2)
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   229
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   230
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
   231
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   232
  $ hg am -m 'added b (3)'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   233
  2 new orphan changesets
4237
9e64a7d09895 next: explicitly specify --no-evolve in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4181
diff changeset
   234
  $ hg next --no-evolve
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1445
diff changeset
   235
  no children
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1448
diff changeset
   236
  (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
   237
  [1]
3549
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   238
  $ hg next --evolve <<EOF
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   239
  > 1
3549
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   240
  > EOF
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   241
  ambiguous next (unstable) changeset, choose one to evolve and update:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   242
  1: [e3b6d5df389b] added c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   243
  2: [9df671ccd2c7] added d
3549
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   244
  q: quit the prompt
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   245
  enter the index of the revision you want to select: 1
3549
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   246
  move:[4] added c
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   247
  atop:[6] added b (3)
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4576
diff changeset
   248
  working directory is now at 5ce67c2407b0
3549
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   249
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   250
  $ hg log -GT "{rev}:{node|short} {desc}\n"
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   251
  @  7:5ce67c2407b0 added c
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   252
  |
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   253
  o  6:d7f119adc759 added b (3)
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   254
  |
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   255
  | *  5:9df671ccd2c7 added d
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   256
  | |
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   257
  | x  3:9ad178109a19 added b (2)
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   258
  |/
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   259
  o  0:a154386e50d1 added a
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   260
  
802441114400 next: prompt user to choose child in ambiguity in `hg next --evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3547
diff changeset
   261
4576
96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch
Anton Shestakov <av6@dwimlabs.net>
parents: 4476
diff changeset
   262
  $ hg evolve -r 5 --update
1445
6fd6c98f9f70 next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1427
diff changeset
   263
  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
   264
  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
   265
  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
   266
3551
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   267
prev with multiple parents
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   268
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   269
  $ hg log -GT "{rev}:{node|short} {desc}\n"
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   270
  @  8:47ea25be8aea added d
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   271
  |
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   272
  | o  7:5ce67c2407b0 added c
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   273
  |/
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   274
  o  6:d7f119adc759 added b (3)
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   275
  |
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   276
  o  0:a154386e50d1 added a
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   277
  
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   278
  $ hg merge -r 5ce67c2407b0
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   279
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   280
  (branch merge, don't forget to commit)
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   281
  $ hg ci -m "merge commit"
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   282
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   283
  $ hg prev <<EOF
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   284
  > q
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   285
  > EOF
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   286
  multiple parents, choose one to update:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   287
  1: [47ea25be8aea] added d
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   288
  2: [5ce67c2407b0] added c
3551
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   289
  q: quit the prompt
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   290
  enter the index of the revision you want to select: q
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   291
  [8] added d
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   292
  [7] added c
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   293
  multiple parents, explicitly update to one
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   294
  [1]
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   295
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   296
  $ hg prev --config ui.interactive=False
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   297
  [8] added d
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   298
  [7] added c
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   299
  multiple parents, explicitly update to one
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   300
  [1]
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   301
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   302
  $ hg prev <<EOF
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   303
  > 2
3551
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   304
  > EOF
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   305
  multiple parents, choose one to update:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   306
  1: [47ea25be8aea] added d
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   307
  2: [5ce67c2407b0] added c
3551
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   308
  q: quit the prompt
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   309
  enter the index of the revision you want to select: 2
3551
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   310
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   311
  [7] added c
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   312
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   313
  $ hg log -GT "{rev}:{node|short} {desc}\n"
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   314
  o    9:a4b8c25a87d3 merge commit
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   315
  |\
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   316
  | o  8:47ea25be8aea added d
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   317
  | |
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   318
  @ |  7:5ce67c2407b0 added c
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   319
  |/
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   320
  o  6:d7f119adc759 added b (3)
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   321
  |
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   322
  o  0:a154386e50d1 added a
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   323
  
ce346c6165c6 prev: prompt user to choose parent in case of multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3549
diff changeset
   324
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
   325
  $ 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
   326
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   327
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
   328
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   329
  $ hg init repo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   330
  $ cd repo
3486
bee9fee8f36b test: explicitly run HGEDITOR shell command with `sh`
Matt Harbison <matt_harbison@yahoo.com>
parents: 3232
diff changeset
   331
  $ HGEDITOR="sh ${TESTDIR}/fake-editor.sh"
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   332
  $ echo hi > foo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   333
  $ 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
   334
  adding foo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   335
  $ echo bye > foo
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   336
  $ 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
   337
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   338
  $ hg amend --edit &
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   339
  $ sleep 1
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   340
  $ hg prev
1743
299cdaa24fa5 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1742
diff changeset
   341
  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
4395
610999a1bae1 test: wider time matching in prev/next lock testing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4294
diff changeset
   342
  got lock after (\d+) seconds (re)
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   343
  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
   344
  [0] one
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   345
  $ wait
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   346
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   347
  $ hg amend --edit &
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   348
  $ sleep 1
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   349
  $ hg next --evolve
1743
299cdaa24fa5 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1742
diff changeset
   350
  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   351
  1 new orphan changesets
4397
d2c1e6d61658 test: wider another time matching in prev/next lock testing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4395
diff changeset
   352
  got lock after (\d+) seconds (re)
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   353
  move:[2] two
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   354
  atop:[3] one
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4576
diff changeset
   355
  working directory is now at a7d885c75614
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents: 1500
diff changeset
   356
  $ wait
3778
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   357
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   358
testing next --evolve when working directory is dirty
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   359
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   360
  $ hg log -GT "{rev}:{node|short} {desc|firstline}"
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   361
  @  4:a7d885c75614 two
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   362
  |
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   363
  o  3:c741983992fc one
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   364
  
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   365
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   366
  $ hg up .^
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   367
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   368
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   369
  $ echo foobar > bar
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   370
  $ hg add bar
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   371
  $ hg amend
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   372
  1 new orphan changesets
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   373
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   374
  $ echo babar > bar
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   375
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   376
  $ hg next --evolve
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   377
  abort: uncommitted changes
4240
323b3dac5bba next: improve the message for dirty working copy with --evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4237
diff changeset
   378
  (use `hg amend`, `hg revert` or `hg shelve`)
3778
1bf0d353f999 tests: add test of `hg next --evolve` with dirty working directory
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3552
diff changeset
   379
  [255]
3780
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   380
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   381
  $ cd ..
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   382
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   383
Testing that `next` and `prev` respects `commands.update.check=noconflict`
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   384
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   385
  $ hg init noconflict
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   386
  $ cd noconflict
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   387
  $ echo "[commands]" >> .hg/hgrc
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   388
  $ echo "update.check=noconflict" >> .hg/hgrc
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   389
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   390
  $ echo hi > wat
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   391
  $ hg ci -Aqm "added wat"
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   392
  $ echo hi > foo
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   393
  $ hg ci -Aqm "added foo"
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   394
  $ echo hi > bar
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   395
  $ hg ci -Aqm "added bar"
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   396
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   397
testing for `hg prev`
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   398
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   399
  $ echo bar > wat
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   400
  $ hg prev
3781
e73a73b27f3e prev: respect `commands.update.check` config option in `hg prev` (issue5808)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3780
diff changeset
   401
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
e73a73b27f3e prev: respect `commands.update.check` config option in `hg prev` (issue5808)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3780
diff changeset
   402
  [1] added foo
3780
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   403
  $ hg diff
3781
e73a73b27f3e prev: respect `commands.update.check` config option in `hg prev` (issue5808)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3780
diff changeset
   404
  diff -r cf959ce4e1ff wat
3780
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   405
  --- a/wat	Thu Jan 01 00:00:00 1970 +0000
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   406
  +++ b/wat	Thu Jan 01 00:00:00 1970 +0000
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   407
  @@ -1,1 +1,1 @@
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   408
  -hi
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   409
  +bar
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   410
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   411
testing for `hg next`
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   412
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   413
  $ hg next
3782
27cf636b2f4d next: respect `commands.update.check` config option in `hg next` (issue5808)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3781
diff changeset
   414
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27cf636b2f4d next: respect `commands.update.check` config option in `hg next` (issue5808)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3781
diff changeset
   415
  [2] added bar
3780
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   416
  $ hg diff
3782
27cf636b2f4d next: respect `commands.update.check` config option in `hg next` (issue5808)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3781
diff changeset
   417
  diff -r ac3de1218820 wat
3780
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   418
  --- a/wat	Thu Jan 01 00:00:00 1970 +0000
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   419
  +++ b/wat	Thu Jan 01 00:00:00 1970 +0000
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   420
  @@ -1,1 +1,1 @@
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   421
  -hi
9da11755d615 tests: add test demonstrating issue5808
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3779
diff changeset
   422
  +bar
3783
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   423
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   424
test that we dont end up in merge conflicts
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   425
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   426
  $ echo bar > bar
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   427
  $ hg prev
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   428
  abort: conflicting changes
3784
838fc71ddb9c next-prev: replace the error hint to mention about `--merge` flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3783
diff changeset
   429
  (do you want --merge?)
3783
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   430
  [255]
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   431
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   432
  $ echo hi > bar
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   433
  $ hg prev
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   434
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   435
  [1] added foo
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   436
  $ echo bar > bar
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   437
  $ hg add bar
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   438
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   439
  $ hg next
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   440
  abort: conflicting changes
3784
838fc71ddb9c next-prev: replace the error hint to mention about `--merge` flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3783
diff changeset
   441
  (do you want --merge?)
3783
313484606461 tests: add tests for conflicts while respecting commands.update.check
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3782
diff changeset
   442
  [255]
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   443
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   444
Test that --merge still works fine with commands.update.check set
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   445
4475
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   446
  $ hg config commands.update.check
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   447
  noconflict
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   448
  $ echo hi > bar
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   449
  $ echo bar >> bar
4475
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   450
  $ hg next
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   451
  abort: conflicting changes
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   452
  (do you want --merge?)
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   453
  [255]
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   454
  $ hg next --merge
3813
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   455
  merging bar
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   456
  warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   457
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   458
  use 'hg resolve' to retry unresolved file merges
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   459
  [2] added bar
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   460
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   461
  $ echo babar > bar
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   462
  $ hg resolve -m
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   463
  (no more unresolved files)
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   464
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   465
Testing --merge works with other values of commands.update.check also
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   466
4475
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   467
  $ hg prev --config commands.update.check=abort
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   468
  abort: uncommitted changes
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   469
  (do you want --merge?)
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   470
  [255]
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   471
  $ hg prev --merge --config commands.update.check=abort
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4168
diff changeset
   472
  file 'bar' was deleted in other [destination] but was modified in local [working copy].
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4168
diff changeset
   473
  What do you want to do?
3813
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   474
  use (c)hanged version, (d)elete, or leave (u)nresolved? 
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   475
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   476
  use 'hg resolve' to retry unresolved file merges
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   477
  [1] added foo
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   478
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   479
  $ hg revert --all
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   480
  forgetting bar
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   481
  reverting wat
3813
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   482
  $ hg resolve -m
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   483
  (no more unresolved files)
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   484
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   485
  $ echo bar > bar
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   486
  $ hg add bar
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   487
4475
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   488
  $ hg next --config commands.update.check=abort
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   489
  abort: uncommitted changes
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   490
  (do you want --merge?)
256b28ce03e3 next: clarify tests related to `commands.update.check` test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4398
diff changeset
   491
  [255]
3812
25dfa95c37fd next-prev: add tests showing --merge not respected in some cases
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3784
diff changeset
   492
  $ hg next --merge --config commands.update.check=abort
3813
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   493
  merging bar
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   494
  warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   495
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   496
  use 'hg resolve' to retry unresolved file merges
27e7ed2d13a6 next-prev: always respect the --merge flag
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3812
diff changeset
   497
  [2] added bar
4251
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   498
4252
a07cd1d076bb next: solve the issue of `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4251
diff changeset
   499
Add test which shows that now `next` command does not get confused by split:
a07cd1d076bb next: solve the issue of `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4251
diff changeset
   500
----------------------------------------------------------------------------
4251
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   501
  $ cd ..
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   502
  $ mkdir nextconfused
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   503
  $ cd nextconfused
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   504
  $ hg init
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   505
  $ echo firstline > a
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   506
  $ hg add a
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   507
  $ hg ci -qm A
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   508
  $ echo bbbbb > b
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   509
  $ echo secondline >> a
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   510
  $ hg add b
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   511
  $ hg ci -qm B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   512
  $ echo ccccc > c
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   513
  $ hg add c
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   514
  $ hg ci -qm C
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   515
  $ hg log -GT "{rev}:{node|short} {desc}\n"
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   516
  @  2:fdc998261dcb C
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   517
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   518
  o  1:cc0edb0cc2b1 B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   519
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   520
  o  0:cae96ff49c84 A
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   521
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   522
  $ hg up 1
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   523
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   524
  $ hg split << EOF
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   525
  > y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   526
  > y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   527
  > n
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
   528
  > Y
4251
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   529
  > y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   530
  > y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   531
  > EOF
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   532
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   533
  reverting a
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   534
  adding b
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   535
  diff --git a/a b/a
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   536
  1 hunks, 1 lines changed
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   537
  examine changes to 'a'? [Ynesfdaq?] y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   538
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   539
  @@ -1,1 +1,2 @@
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   540
   firstline
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   541
  +secondline
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   542
  record change 1/2 to 'a'? [Ynesfdaq?] y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   543
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   544
  diff --git a/b b/b
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   545
  new file mode 100644
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   546
  examine changes to 'b'? [Ynesfdaq?] n
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   547
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   548
  created new head
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
   549
  continue splitting? [Ycdq?] Y
4251
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   550
  diff --git a/b b/b
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   551
  new file mode 100644
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   552
  examine changes to 'b'? [Ynesfdaq?] y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   553
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   554
  @@ -0,0 +1,1 @@
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   555
  +bbbbb
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   556
  record this change to 'b'? [Ynesfdaq?] y
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   557
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   558
  no more change to split
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   559
  1 new orphan changesets
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   560
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   561
  $ hg up 3 -q
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   562
  $ hg log -GT "{rev}:{node|short} {desc}\n"
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   563
  o  4:279f6cab32b5 B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   564
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   565
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   566
  |  new desc
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   567
  @  3:a9f74d07e45c B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   568
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   569
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   570
  |  new desc
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   571
  | *  2:fdc998261dcb C
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   572
  | |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   573
  | x  1:cc0edb0cc2b1 B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   574
  |/
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   575
  o  0:cae96ff49c84 A
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   576
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   577
  $ hg ci --amend -m "B modified"
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   578
  1 new orphan changesets
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   579
  $ hg log -GT "{rev}:{node|short} {desc}\n"
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   580
  @  5:64ab03d3110c B modified
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   581
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   582
  | *  4:279f6cab32b5 B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   583
  | |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   584
  | |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   585
  | |  new desc
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   586
  | x  3:a9f74d07e45c B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   587
  |/
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   588
  |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   589
  |    new desc
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   590
  | *  2:fdc998261dcb C
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   591
  | |
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   592
  | x  1:cc0edb0cc2b1 B
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   593
  |/
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   594
  o  0:cae96ff49c84 A
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   595
  
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   596
  $ hg next --evolve << EOF
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   597
  > q
a5ec7652c4f4 next: add test which shows that `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4240
diff changeset
   598
  > EOF
4252
a07cd1d076bb next: solve the issue of `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4251
diff changeset
   599
  move:[4] B
a07cd1d076bb next: solve the issue of `next` get confused by split
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4251
diff changeset
   600
  atop:[5] B modified
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4576
diff changeset
   601
  working directory is now at 1b434459c7e7