author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Mon, 03 Sep 2018 23:17:50 +0200 | |
branch | stable |
changeset 4083 | 8d8f08245f97 |
parent 4053 | ecbf61d90807 |
child 4076 | f9a850018daa |
child 4183 | 536c67823962 |
child 4229 | a8ed26f01c8d |
child 5219 | acc3253f0ebc |
permissions | -rw-r--r-- |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
Test for the grab command |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
$ cat >> $HGRCPATH <<EOF |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
> [alias] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
> glog = log -G -T "{rev}:{node|short} {desc}\n" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
> [extensions] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
> EOF |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
$ mkcommit() { |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
> echo "$1" > "$1" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
> hg add "$1" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
> hg ci -m "add $1" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> } |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
$ hg init repo |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ cd repo |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
$ hg help grab |
4048
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
19 |
hg pick [-r] rev |
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
20 |
|
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
21 |
aliases: grab |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
grabs a commit, move it on the top of working directory parent and |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
updates to it. |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
options: |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
|
4048
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
28 |
-r --rev VALUE revision to pick |
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
29 |
-c --continue continue interrupted pick |
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
30 |
-a --abort abort interrupted pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
(some details hidden, use --verbose to show complete help) |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
$ mkcommit a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
$ mkcommit b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
$ mkcommit c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
$ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
@ 2:4538525df7e2 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
o 1:7c3bad9141dc add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
Grabbing an ancestor |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
48 |
$ hg pick -r 7c3bad9141dc |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
49 |
abort: cannot pick an ancestor revision |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
[255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
|
3527
7b4d1bfb6b7d
grab: gracefully handle the case when we try to grab parent of wdir
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3526
diff
changeset
|
52 |
Grabbing the working directory parent |
7b4d1bfb6b7d
grab: gracefully handle the case when we try to grab parent of wdir
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3526
diff
changeset
|
53 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
54 |
$ hg pick -r . |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
55 |
abort: cannot pick an ancestor revision |
3527
7b4d1bfb6b7d
grab: gracefully handle the case when we try to grab parent of wdir
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3526
diff
changeset
|
56 |
[255] |
7b4d1bfb6b7d
grab: gracefully handle the case when we try to grab parent of wdir
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3526
diff
changeset
|
57 |
|
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
Specifying multiple revisions to grab |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
60 |
$ hg pick 1f0dee641bb7 -r 7c3bad9141dc |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
abort: specify just one revision |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
[255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
Specifying no revisions to grab |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
66 |
$ hg pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
abort: empty revision set |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
[255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
Continuing without interrupted grab |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
72 |
$ hg pick --continue |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
73 |
abort: no interrupted pick state exists |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
[255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
Aborting without interrupted grab |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
78 |
$ hg pick --abort |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
79 |
abort: no interrupted pick state exists |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
[255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
Specifying both continue and revs |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
$ hg up 1f0dee641bb7 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
86 |
$ hg pick -r 4538525df7e2 --continue |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
abort: cannot specify both --continue and revision |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
[255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
Making new branch heads |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
$ mkcommit x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
created new head |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
$ mkcommit y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
$ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
@ 4:d46dc301d92f add y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
o 3:8e224524cd09 add x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
| o 2:4538525df7e2 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
| | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
| o 1:7c3bad9141dc add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
|/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
Grabbing a revision |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
109 |
$ hg pick 7c3bad9141dc |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
110 |
picking 1:7c3bad9141dc "add b" |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
1 new orphan changesets |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
$ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
@ 5:7c15c05db6fa add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
o 4:d46dc301d92f add y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
o 3:8e224524cd09 add x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
| * 2:4538525df7e2 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 |
| | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
| x 1:7c3bad9141dc add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
|/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
When grab does not create any changes |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
$ hg graft -r 4538525df7e2 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
grafting 2:4538525df7e2 "add c" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 |
$ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
@ 6:c4636a81ebeb add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 |
o 5:7c15c05db6fa add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
136 |
o 4:d46dc301d92f add y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 |
o 3:8e224524cd09 add x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 |
| * 2:4538525df7e2 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 |
| | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
142 |
| x 1:7c3bad9141dc add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 |
|/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
146 |
$ hg pick -r 4538525df7e2 |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
147 |
picking 2:4538525df7e2 "add c" |
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
148 |
note: picking 2:4538525df7e2 created no changes to commit |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
149 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 |
$ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
151 |
@ 6:c4636a81ebeb add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
153 |
o 5:7c15c05db6fa add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 |
o 4:d46dc301d92f add y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 |
o 3:8e224524cd09 add x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
161 |
interrupted grab |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
162 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
163 |
$ hg up d46dc301d92f |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
165 |
$ echo foo > c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
166 |
$ hg ci -Aqm "foo to c" |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
167 |
$ hg pick -r c4636a81ebeb |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
168 |
picking 6:c4636a81ebeb "add c" |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
169 |
merging c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
170 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
171 |
unresolved merge conflicts (see hg help resolve) |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
172 |
[1] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
173 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
174 |
$ echo foobar > c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
175 |
$ hg resolve --all --mark |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
176 |
(no more unresolved files) |
4052
73e73471d6c6
pick: replace "grabstate" with "pickstate"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4049
diff
changeset
|
177 |
continue: hg pick --continue |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
178 |
$ hg pick --continue |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
179 |
$ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
180 |
@ 8:44e155eb95c7 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
181 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
182 |
o 7:2ccc03d1d096 foo to c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
183 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
184 |
| o 5:7c15c05db6fa add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
185 |
|/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
186 |
o 4:d46dc301d92f add y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
187 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
188 |
o 3:8e224524cd09 add x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
189 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
190 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
191 |
|
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
192 |
|
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
193 |
When interrupted grab results in no changes to commit |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
194 |
|
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
195 |
$ hg up d46dc301d92f |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
196 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
197 |
$ echo bar > c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
198 |
$ hg add c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
199 |
$ hg ci -m "foo to c" |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
200 |
created new head |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
201 |
|
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
202 |
$ hg up 44e155eb95c7 |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
203 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
204 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
205 |
$ hg pick 4e04628911f6 |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
206 |
picking 9:4e04628911f6 "foo to c" |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
207 |
merging c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
208 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
209 |
unresolved merge conflicts (see hg help resolve) |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
210 |
[1] |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
211 |
$ echo foobar > c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
212 |
$ hg resolve -m |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
213 |
(no more unresolved files) |
4052
73e73471d6c6
pick: replace "grabstate" with "pickstate"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4049
diff
changeset
|
214 |
continue: hg pick --continue |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
215 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
216 |
$ hg pick --continue |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
217 |
note: picking 9:4e04628911f6 created no changes to commit |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
218 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
219 |
Testing the abort functionality of hg pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
220 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
221 |
$ echo foo > b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
222 |
$ hg ci -Aqm "foo to b" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
223 |
$ hg glog -r .^:: |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
224 |
@ 10:c437988de89f foo to b |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
225 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
226 |
o 8:44e155eb95c7 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
227 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
228 |
~ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
229 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
230 |
$ hg pick -r 7c15c05db6fa |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
231 |
picking 5:7c15c05db6fa "add b" |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
232 |
merging b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
233 |
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
234 |
unresolved merge conflicts (see hg help resolve) |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
235 |
[1] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
236 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
237 |
$ hg pick --abort |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
238 |
aborting pick, updating to c437988de89f |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
239 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
240 |
$ hg glog |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
241 |
@ 10:c437988de89f foo to b |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
242 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
243 |
o 8:44e155eb95c7 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
244 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
245 |
o 7:2ccc03d1d096 foo to c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
246 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
247 |
| o 5:7c15c05db6fa add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
248 |
|/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
249 |
o 4:d46dc301d92f add y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
250 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
251 |
o 3:8e224524cd09 add x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
252 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
253 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
254 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
255 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
256 |
Trying to grab a public changeset |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
257 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
258 |
$ hg phase -r 7c15c05db6fa -p |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
259 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
260 |
$ hg pick -r 7c15c05db6fa |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
261 |
abort: cannot pick public changesets: 7c15c05db6fa |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
262 |
(see 'hg help phases' for details) |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
263 |
[255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
264 |
|
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
265 |
$ hg glog |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
266 |
@ 10:c437988de89f foo to b |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
267 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
268 |
o 8:44e155eb95c7 add c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
269 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
270 |
o 7:2ccc03d1d096 foo to c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
271 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
272 |
| o 5:7c15c05db6fa add b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
273 |
|/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
274 |
o 4:d46dc301d92f add y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
275 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
276 |
o 3:8e224524cd09 add x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
277 |
| |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
278 |
o 0:1f0dee641bb7 add a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
279 |
|
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
280 |
Checking phase preservation while grabbing secret changeset |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
281 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
282 |
In case of merge conflicts |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
283 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
284 |
$ hg phase -r 7c15c05db6fa -s -f |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
285 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
286 |
$ hg pick -r 7c15c05db6fa |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
287 |
picking 5:7c15c05db6fa "add b" |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
288 |
merging b |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
289 |
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
290 |
unresolved merge conflicts (see hg help resolve) |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
291 |
[1] |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
292 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
293 |
$ echo bar > b |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
294 |
$ hg resolve -m |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
295 |
(no more unresolved files) |
4052
73e73471d6c6
pick: replace "grabstate" with "pickstate"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4049
diff
changeset
|
296 |
continue: hg pick --continue |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
297 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
298 |
$ hg pick --continue |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
299 |
$ hg phase -r . |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
300 |
11: secret |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
301 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
302 |
No merge conflicts |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
303 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
304 |
$ hg up d46dc301d92f |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
305 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
306 |
$ echo foo > l |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
307 |
$ hg add l |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
308 |
$ hg ci -qm "added l" --secret |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
309 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
310 |
$ hg phase -r . |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
311 |
12: secret |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
312 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
313 |
$ hg glog |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
314 |
@ 12:508d572e7053 added l |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
315 |
| |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
316 |
| o 11:10427de9e26e add b |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
317 |
| | |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
318 |
| o 10:c437988de89f foo to b |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
319 |
| | |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
320 |
| o 8:44e155eb95c7 add c |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
321 |
| | |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
322 |
| o 7:2ccc03d1d096 foo to c |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
323 |
|/ |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
324 |
o 4:d46dc301d92f add y |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
325 |
| |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
326 |
o 3:8e224524cd09 add x |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
327 |
| |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
328 |
o 0:1f0dee641bb7 add a |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
329 |
|
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
330 |
$ hg up 10427de9e26e |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
331 |
3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
332 |
|
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
333 |
$ hg pick -r 508d572e7053 |
4049
25981fae92f9
pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4048
diff
changeset
|
334 |
picking 12:508d572e7053 "added l" |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
335 |
|
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
336 |
$ hg phase -r . |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
337 |
13: secret |