| author | Pierre-Yves David <pierre-yves.david@fb.com> |
| Wed, 24 Jun 2015 19:42:01 -0700 | |
| changeset 1448 | 3c113c097339 |
| parent 1447 | 09206bdc2db4 |
| child 1449 | 9be1cadf7a07 |
| permissions | -rw-r--r-- |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
1 |
$ cat >> $HGRCPATH <<EOF |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
2 |
> [extensions] |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
3 |
> hgext.graphlog= |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
4 |
> EOF |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
5 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
6 |
|
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
7 |
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
|
8 |
$ hg init |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
9 |
$ touch a |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
10 |
$ hg add a |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
11 |
$ hg commit -m 'added a' |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
12 |
$ touch b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
13 |
$ hg add b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
14 |
$ hg commit -m 'added b' |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
15 |
$ hg bookmark mark |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
16 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
17 |
* mark 1:6e742c9127b3 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
18 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
19 |
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
|
20 |
[0] added a |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
21 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
22 |
* mark 0:a154386e50d1 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
23 |
|
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
24 |
hg next -B should move active bookmark |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
25 |
$ hg next -B |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
26 |
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
|
27 |
[1] added b |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
28 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
29 |
* mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
30 |
|
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
31 |
hg prev should unset active bookmark |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
32 |
$ hg prev |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
33 |
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
|
34 |
[0] added a |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
35 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
36 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
37 |
|
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
38 |
hg next should move active bookmark |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
39 |
$ hg bookmark mark2 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
40 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
41 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
42 |
* mark2 0:a154386e50d1 |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
43 |
$ hg next |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
44 |
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
|
45 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
46 |
$ hg bookmarks |
|
1160
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 |
mark2 0:a154386e50d1 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
49 |
|
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
50 |
$ hg bookmark -d mark2 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
51 |
$ hg bookmark mark |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
52 |
|
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
53 |
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
|
54 |
$ touch c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
55 |
$ hg add c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
56 |
$ hg commit -m 'added c' |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
57 |
$ hg bookmark -r2 no-move |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
58 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
59 |
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
|
60 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
61 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
62 |
* mark 1:6e742c9127b3 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
63 |
no-move 2:4e26ef31f919 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
64 |
$ hg next -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
65 |
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
|
66 |
[2] added c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
67 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
68 |
* mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
69 |
no-move 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
70 |
$ hg up 1 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
71 |
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
|
72 |
(leaving bookmark mark) |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
73 |
$ hg next -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
74 |
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
|
75 |
[2] added c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
76 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
77 |
mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
78 |
no-move 2:4e26ef31f919 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
79 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
80 |
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
|
81 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
82 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
83 |
mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
84 |
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
|
85 |
|
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
86 |
|
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
87 |
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
|
88 |
-------------------------------- |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
89 |
|
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
90 |
$ 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
|
91 |
$ 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
|
92 |
$ hg prev |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
93 |
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
|
94 |
(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
|
95 |
[255] |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
96 |
$ 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
|
97 |
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
|
98 |
[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
|
99 |
$ hg next |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
100 |
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
|
101 |
(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
|
102 |
[255] |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
103 |
$ 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
|
104 |
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
|
105 |
[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
|
106 |
|
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
107 |
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
|
108 |
------------------------------- |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
109 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
110 |
$ hg revert --all |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
111 |
forgetting modified-bar |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
112 |
$ hg log -G |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
113 |
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
|
114 |
| bookmark: mark |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
115 |
| bookmark: no-move |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
116 |
| tag: tip |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
117 |
| user: test |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
118 |
| 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
|
119 |
| summary: added c |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
120 |
| |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
121 |
@ changeset: 1:6e742c9127b3 |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
122 |
| user: test |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
123 |
| 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
|
124 |
| summary: added b |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
125 |
| |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
126 |
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
|
127 |
user: test |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
128 |
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
|
129 |
summary: added a |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
130 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
131 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
132 |
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
|
133 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
134 |
$ hg next |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
135 |
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
|
136 |
[2] added c |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
137 |
$ hg next |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
138 |
no children |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
139 |
[1] |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
140 |
$ hg prev |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
141 |
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
|
142 |
[1] added b |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
143 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
144 |
some aspiring children |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
145 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
146 |
$ hg amend -m 'added b (2)' |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
147 |
1 new unstable changesets |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
148 |
$ hg next |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
149 |
no children |
|
1448
3c113c097339
next: print some message when on a head with some aspiring children
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1447
diff
changeset
|
150 |
(1 unstable changesets to be evolved here, do you want to evolve?) |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
151 |
[1] |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
152 |
$ hg evolve |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
153 |
move:[2] added c |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
154 |
atop:[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
|
155 |
working directory is now at e3b6d5df389b |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
156 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
157 |
next with ambiguity |
|
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 |
$ hg prev |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
160 |
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
|
161 |
[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
|
162 |
$ echo d > d |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
163 |
$ hg add d |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
164 |
$ 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
|
165 |
created new head |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
166 |
$ hg prev |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
167 |
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
|
168 |
[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
|
169 |
$ hg next |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
170 |
ambigious next changeset: |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
171 |
[4] added c |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
172 |
[5] added d |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
173 |
explicitly update to one of them |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
174 |
[1] |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
175 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
176 |
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
|
177 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
178 |
$ hg am -m 'added b (3)' |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
179 |
2 new unstable changesets |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
180 |
$ hg next |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
181 |
no children |
|
1448
3c113c097339
next: print some message when on a head with some aspiring children
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1447
diff
changeset
|
182 |
(2 unstable changesets to be evolved here, do you want to evolve?) |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
183 |
[1] |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
184 |
$ hg evolve |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
185 |
abort: multiple evolve candidates |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
186 |
(select one of e3b6d5df389b, 9df671ccd2c7 with --rev) |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
187 |
[255] |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
188 |
$ hg evolve -r 5 |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
189 |
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
|
190 |
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
|
191 |
working directory is now at 47ea25be8aea |