| author | Mike Edgar <adgar@google.com> |
| Tue, 18 Nov 2014 20:27:53 -0500 | |
| branch | stable |
| changeset 1162 | 5c07f464981e |
| parent 1160 | e29a813f6af5 |
| child 1185 | cc3e68120185 |
| 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.rebase= |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
4 |
> hgext.graphlog= |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
5 |
> EOF |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
6 |
$ 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
|
7 |
|
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
8 |
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
|
9 |
$ hg init |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
10 |
$ touch a |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
11 |
$ hg add a |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
12 |
$ hg commit -m 'added a' |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
13 |
$ touch b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
14 |
$ hg add b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
15 |
$ hg commit -m 'added b' |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
16 |
$ hg bookmark mark |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
17 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
18 |
* mark 1:6e742c9127b3 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
19 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
20 |
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
|
21 |
[0] added a |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
22 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
23 |
* mark 0:a154386e50d1 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
24 |
|
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
25 |
hg next -B should move active bookmark |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
26 |
$ hg next -B |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
27 |
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
|
28 |
[1] added b |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
29 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
30 |
* mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
31 |
|
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
32 |
hg prev should unset active bookmark |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
33 |
$ hg prev |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
34 |
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
|
35 |
[0] added a |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
36 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
37 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
38 |
|
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
39 |
hg next should move active bookmark |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
40 |
$ hg bookmark mark2 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
41 |
$ hg bookmarks |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
42 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
43 |
* mark2 0:a154386e50d1 |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
44 |
$ hg next |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
45 |
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
|
46 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
47 |
$ hg bookmarks |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
48 |
mark 1:6e742c9127b3 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
49 |
mark2 0:a154386e50d1 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
50 |
|
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
51 |
$ hg bookmark -d mark2 |
|
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
52 |
$ hg bookmark mark |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
53 |
|
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
54 |
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
|
55 |
$ touch c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
56 |
$ hg add c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
57 |
$ hg commit -m 'added c' |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
58 |
$ hg bookmark -r2 no-move |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
59 |
$ hg prev -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
60 |
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
|
61 |
[1] added b |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
62 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
63 |
* mark 1:6e742c9127b3 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
64 |
no-move 2:4e26ef31f919 |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
65 |
$ hg next -B |
|
892
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 |
[2] added c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
68 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
69 |
* mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
70 |
no-move 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
71 |
$ hg up 1 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
72 |
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
|
73 |
(leaving bookmark mark) |
|
1160
e29a813f6af5
Make next/prev only move bookmarks optionally
Ryan McElroy <rmcelroy@fb.com>
parents:
964
diff
changeset
|
74 |
$ hg next -B |
|
892
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
75 |
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
|
76 |
[2] added c |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
77 |
$ hg bookmarks |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
78 |
mark 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
79 |
no-move 2:4e26ef31f919 |
|
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 2:4e26ef31f919 |
|
947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff
changeset
|
85 |
no-move 2:4e26ef31f919 |