| author | Pulkit Goyal <7895pulkit@gmail.com> |
| Fri, 16 Mar 2018 15:21:05 +0530 | |
| branch | stable |
| changeset 3534 | cd4db75413a2 |
| parent 3486 | bee9fee8f36b |
| child 3488 | 1baf32675ec6 |
| 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 |
> EOF |
|
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1756
diff
changeset
|
4 |
$ 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
|
5 |
|
|
3196
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
6 |
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
|
7 |
$ 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
|
8 |
$ cd test-repo |
|
892
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' |
|
3196
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
15 |
$ hg prev |
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
16 |
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
|
17 |
[0] added a |
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
18 |
$ hg next |
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
19 |
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
|
20 |
[1] added b |
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
21 |
|
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
22 |
hg prev & next respect --quiet |
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
23 |
$ hg prev -q |
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
24 |
$ hg next -q |
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
25 |
|
|
94e5235e95f5
evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3013
diff
changeset
|
26 |
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
|
27 |
$ hg bookmark mark |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
28 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
29 |
* mark 1:6e742c9127b3 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
30 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
31 |
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
|
32 |
[0] added a |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
33 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
34 |
* mark 0:a154386e50d1 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
35 |
|
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
36 |
hg next -B should move active bookmark |
| 1500 | 37 |
$ hg next -B --dry-run |
38 |
hg update 1; |
|
39 |
hg bookmark mark -r 1; |
|
40 |
[1] added b |
|
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
41 |
$ hg next -B |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
42 |
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
|
43 |
[1] added b |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
44 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
45 |
* mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
46 |
|
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
47 |
hg prev should unset active bookmark |
| 1500 | 48 |
$ hg prev --dry-run |
49 |
hg update 0; |
|
50 |
[0] added a |
|
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
51 |
$ hg prev |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
52 |
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
|
53 |
[0] added a |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
54 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
55 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
56 |
|
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
57 |
hg next should move active bookmark |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
58 |
$ hg bookmark mark2 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
59 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
60 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
61 |
* mark2 0:a154386e50d1 |
|
2396
c1485ebdd6b9
color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
62 |
$ hg next --dry-run --color=debug |
|
c1485ebdd6b9
color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
63 |
hg update 1; |
|
c1485ebdd6b9
color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
64 |
[[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
|
65 |
$ hg next |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
66 |
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
|
67 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
68 |
$ hg bookmarks |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
69 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
70 |
mark2 0:a154386e50d1 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
71 |
|
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
72 |
$ hg bookmark -d mark2 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
73 |
$ hg bookmark mark |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
74 |
|
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
75 |
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
|
76 |
$ touch c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
77 |
$ hg add c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
78 |
$ hg commit -m 'added c' |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
79 |
$ hg bookmark -r2 no-move |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
80 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
81 |
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
|
82 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
83 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
84 |
* mark 1:6e742c9127b3 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
85 |
no-move 2:4e26ef31f919 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
86 |
$ hg next -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
87 |
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
|
88 |
[2] added c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
89 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
90 |
* mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
91 |
no-move 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
92 |
$ hg up 1 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
93 |
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
|
94 |
(leaving bookmark mark) |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
95 |
$ hg next -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
96 |
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
|
97 |
[2] added c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
98 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
99 |
mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
100 |
no-move 2:4e26ef31f919 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
101 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
102 |
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
|
103 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
104 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
105 |
mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
106 |
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
|
107 |
|
|
2738
3f27fe80be26
prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2737
diff
changeset
|
108 |
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
|
109 |
|
|
3f27fe80be26
prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2737
diff
changeset
|
110 |
$ 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
|
111 |
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
|
112 |
$ hg prev |
|
3f27fe80be26
prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2737
diff
changeset
|
113 |
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
|
114 |
[1] |
|
3f27fe80be26
prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2737
diff
changeset
|
115 |
$ 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
|
116 |
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
|
117 |
|
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
118 |
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
|
119 |
-------------------------------- |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
120 |
|
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
121 |
$ 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
|
122 |
$ 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
|
123 |
$ hg prev |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
124 |
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
|
125 |
(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
|
126 |
[255] |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
127 |
$ 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
|
128 |
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
|
129 |
[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
|
130 |
$ hg next |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
131 |
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
|
132 |
(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
|
133 |
[255] |
|
fcc467ca740e
next/prev: require --merge to move with uncommitted changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
134 |
$ 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
|
135 |
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
|
136 |
[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
|
137 |
|
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
138 |
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
|
139 |
------------------------------- |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
140 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
141 |
$ hg revert --all |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
142 |
forgetting modified-bar |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
143 |
$ hg log -G |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
144 |
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
|
145 |
| bookmark: mark |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
146 |
| bookmark: no-move |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
147 |
| tag: tip |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
148 |
| user: test |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
149 |
| 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
|
150 |
| summary: added c |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
151 |
| |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
152 |
@ changeset: 1:6e742c9127b3 |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
153 |
| user: test |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
154 |
| 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
|
155 |
| summary: added b |
|
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 |
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
|
158 |
user: test |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
159 |
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
|
160 |
summary: added a |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
161 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
162 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
163 |
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
|
164 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
165 |
$ hg next |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
166 |
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
|
167 |
[2] added c |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
168 |
$ hg next |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
169 |
no children |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
170 |
[1] |
|
1487
ee5391999f2d
next: properly report no children when --evolve is used
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1449
diff
changeset
|
171 |
$ 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
|
172 |
no children |
|
ee5391999f2d
next: properly report no children when --evolve is used
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1449
diff
changeset
|
173 |
[1] |
|
2396
c1485ebdd6b9
color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
174 |
$ hg prev --dry-run --color=debug |
|
c1485ebdd6b9
color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
175 |
hg update 1; |
|
c1485ebdd6b9
color: update the shorttemplate to use colors
Boris Feld <boris.feld@octobus.net>
parents:
1806
diff
changeset
|
176 |
[[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
|
177 |
$ hg prev |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
178 |
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
|
179 |
[1] added b |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
180 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
181 |
some aspiring children |
|
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 |
$ 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
|
184 |
1 new orphan changesets |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
185 |
$ hg next |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
186 |
no children |
|
1449
9be1cadf7a07
next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1448
diff
changeset
|
187 |
(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
|
188 |
[1] |
| 1500 | 189 |
$ hg next --evolve --dry-run |
190 |
move:[2] added c |
|
191 |
atop:[3] added b (2) |
|
192 |
hg rebase -r 4e26ef31f919 -d 9ad178109a19 |
|
193 |
working directory now at 9ad178109a19 |
|
|
2443
6a23a55f77d2
next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2396
diff
changeset
|
194 |
|
|
6a23a55f77d2
next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2396
diff
changeset
|
195 |
(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
|
196 |
|
|
6a23a55f77d2
next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2396
diff
changeset
|
197 |
$ hg next --evolve --color debug |
|
6a23a55f77d2
next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2396
diff
changeset
|
198 |
move:[[evolve.rev|2]] added c |
|
6a23a55f77d2
next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2396
diff
changeset
|
199 |
atop:[[evolve.rev|3]] added b (2) |
|
6a23a55f77d2
next: prevent a color related crash when evolve
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2396
diff
changeset
|
200 |
[ ui.status|working directory now at [evolve.node|e3b6d5df389b]] |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
201 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
202 |
next with ambiguity |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
203 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
204 |
$ hg prev |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
205 |
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
|
206 |
[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
|
207 |
$ echo d > d |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
208 |
$ hg add d |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
209 |
$ 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
|
210 |
created new head |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
211 |
$ hg prev |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
212 |
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
|
213 |
[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
|
214 |
$ hg next |
|
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3196
diff
changeset
|
215 |
ambiguous next changeset: |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
216 |
[4] added c |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
217 |
[5] added d |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
218 |
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
|
219 |
[1] |
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
220 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
221 |
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
|
222 |
|
|
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
223 |
$ 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
|
224 |
2 new orphan changesets |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
225 |
$ hg next |
|
1447
09206bdc2db4
next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1445
diff
changeset
|
226 |
no children |
|
1449
9be1cadf7a07
next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1448
diff
changeset
|
227 |
(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
|
228 |
[1] |
|
1449
9be1cadf7a07
next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1448
diff
changeset
|
229 |
$ hg next --evolve |
|
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3196
diff
changeset
|
230 |
ambiguous next (unstable) changeset: |
|
1449
9be1cadf7a07
next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1448
diff
changeset
|
231 |
[4] added c |
|
9be1cadf7a07
next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1448
diff
changeset
|
232 |
[5] added d |
|
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1743
diff
changeset
|
233 |
(run 'hg evolve --rev REV' on one of them) |
|
1449
9be1cadf7a07
next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1448
diff
changeset
|
234 |
[1] |
|
1445
6fd6c98f9f70
next: add extensive testing to the 'next' command
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1427
diff
changeset
|
235 |
$ 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
|
236 |
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
|
237 |
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
|
238 |
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
|
239 |
|
|
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
|
240 |
$ 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
|
241 |
|
|
1742
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
242 |
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
|
243 |
|
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
244 |
$ hg init repo |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
245 |
$ cd repo |
|
3486
bee9fee8f36b
test: explicitly run HGEDITOR shell command with `sh`
Matt Harbison <matt_harbison@yahoo.com>
parents:
3232
diff
changeset
|
246 |
$ 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
|
247 |
$ echo hi > foo |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
248 |
$ 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
|
249 |
adding foo |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
250 |
$ echo bye > foo |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
251 |
$ 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
|
252 |
|
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
253 |
$ hg amend --edit & |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
254 |
$ sleep 1 |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
255 |
$ hg prev |
|
1743
299cdaa24fa5
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1742
diff
changeset
|
256 |
waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
|
1742
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
257 |
got lock after [4-6] seconds (re) |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
258 |
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
|
259 |
[0] one |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
260 |
$ wait |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
261 |
|
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
262 |
$ hg amend --edit & |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
263 |
$ sleep 1 |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
264 |
$ hg next --evolve |
|
1743
299cdaa24fa5
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1742
diff
changeset
|
265 |
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
|
266 |
1 new orphan changesets |
|
1742
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
267 |
got lock after [4-6] seconds (re) |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
268 |
move:[2] two |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
269 |
atop:[3] one |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
270 |
working directory now at a7d885c75614 |
|
970a4c13ebc3
evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
1500
diff
changeset
|
271 |
$ wait |