Mercurial > evolve
annotate tests/test-pick.t @ 5926:aca07ac01167
divergence-resolution: use last evolution date to choose p1 when merging
Before this patch, we choose the minimum revision as p1 while merging the
two divergent csets which had a drawback that if independent user resolve
the same divergence, their final resolved cset would have different hashes
(because of 'divergence_source_local' and 'divergence_source_other' extras).
Now, we decide the p1 on the basis of which of the two divergent cset
was rewritten more recently. This new logic removes the "different hash"
problem.
To save us from big output changes in the tests due to this change, I also
added the second factor i.e revision_number while sorting the csets wrt dates
(as date is same for all the csets in tests) to fallback to the old way of
picking the revision i.e choosing the minimum rev number.
And to demonstrate that now divergence resolution is independent of which
side user run the `hg evolve --content-div` resolved cset id won't change,
I have added a separate test file.
Flag --config devel.default-date='...' is being used here to record a
custom date in the obsmarkers.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 03 Mar 2021 12:40:59 +0530 |
parents | e5d91fd1f319 |
children | 8e4f6354b316 65d4e47d7f26 |
rev | line source |
---|---|
4800
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
1 #testcases abortcommand abortflag |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
2 Test for the pick command |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 $ cat >> $HGRCPATH <<EOF |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 > [alias] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 > glog = log -G -T "{rev}:{node|short} {desc}\n" |
4686
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
7 > glf = log -GT "{rev}: {desc} ({files})\n" |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 > [extensions] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 > EOF |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 $ 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
|
11 |
4800
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
12 #if abortflag |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
13 $ cat >> $HGRCPATH <<EOF |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
14 > [alias] |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
15 > abort = pick --abort |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
16 > EOF |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
17 #endif |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
18 |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 $ mkcommit() { |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 > echo "$1" > "$1" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 > hg add "$1" |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 > 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
|
23 > } |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 $ hg init repo |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 $ cd repo |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
27 $ hg help pick |
4915
5113b38cb677
evolve: use more often seen metavariables in command synopsis strings
Anton Shestakov <av6@dwimlabs.net>
parents:
4891
diff
changeset
|
28 hg pick [OPTION]... [-r] REV |
4048
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
29 |
d7034826c0a2
pick: rename the grab command to pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3527
diff
changeset
|
30 aliases: grab |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
4229
a8ed26f01c8d
pick: `hg help` was not showing the full cmd desc of `pick`
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4053
diff
changeset
|
32 move a commit on the top of working directory parent and updates to it. |
3453
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 options: |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
4391
054ff759f2fd
pick: add --tool for hg pick to specify mergetool
Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com>
parents:
4232
diff
changeset
|
36 -r --rev REV revision to pick |
054ff759f2fd
pick: add --tool for hg pick to specify mergetool
Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com>
parents:
4232
diff
changeset
|
37 -c --continue continue interrupted pick |
054ff759f2fd
pick: add --tool for hg pick to specify mergetool
Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com>
parents:
4232
diff
changeset
|
38 -a --abort abort interrupted pick |
054ff759f2fd
pick: add --tool for hg pick to specify mergetool
Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com>
parents:
4232
diff
changeset
|
39 -t --tool TOOL specify merge tool |
3453
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 (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
|
42 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 $ mkcommit a |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 $ mkcommit b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 $ mkcommit c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 $ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 @ 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
|
49 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 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
|
51 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 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
|
53 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 Grabbing an ancestor |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
57 $ 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
|
58 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
|
59 [255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
3527
7b4d1bfb6b7d
grab: gracefully handle the case when we try to grab parent of wdir
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3526
diff
changeset
|
61 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
|
62 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
63 $ 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
|
64 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
|
65 [255] |
7b4d1bfb6b7d
grab: gracefully handle the case when we try to grab parent of wdir
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3526
diff
changeset
|
66 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
67 Specifying multiple revisions to pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
69 $ 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
|
70 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
|
71 [255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
73 Specifying no revisions to pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
75 $ hg pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 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
|
77 [255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
79 Continuing without interrupted pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
81 $ 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
|
82 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
|
83 [255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
85 Aborting without interrupted pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
87 $ 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
|
88 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
|
89 [255] |
4800
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
90 #if abortcommand |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
91 $ hg abort |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
92 abort: no operation in progress |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
93 [20] |
4800
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
94 #endif |
3453
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 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
|
97 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 $ hg up 1f0dee641bb7 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 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
|
100 $ 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
|
101 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
|
102 [255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 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
|
105 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 $ mkcommit x |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 created new head |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 $ mkcommit y |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 $ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 @ 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
|
112 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 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
|
114 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 | 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
|
116 | | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 | 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
|
118 |/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 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
|
120 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 Grabbing a revision |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
123 $ 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
|
124 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
|
125 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
|
126 $ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 @ 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
|
128 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 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
|
130 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 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
|
132 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 | * 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
|
134 | | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 | 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
|
136 |/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 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
|
138 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
140 When pick does not create any changes |
3453
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 $ 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
|
143 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
|
144 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 $ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
146 @ 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
|
147 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
148 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
|
149 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 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
|
151 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 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
|
153 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 | * 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
|
155 | | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 | 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
|
157 |/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 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
|
159 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
160 $ 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
|
161 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
|
162 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
|
163 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 $ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
165 @ 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
|
166 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
167 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
|
168 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
169 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
|
170 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
171 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
|
172 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
173 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
|
174 |
4891
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
175 |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
176 there were no changes to commit, so there shouldn't be any predecessors of 6, |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
177 and 2 should say it was pruned (issue6093) |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
178 |
5275
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
4915
diff
changeset
|
179 $ hg debugobsolete |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
4915
diff
changeset
|
180 7c3bad9141dcb46ff89abf5f61856facd56e476c 7c15c05db6fa1458a8a745f977f4d2426abde6a0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
4915
diff
changeset
|
181 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'pick', 'user': 'test'} |
4891
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
182 $ hg olog --all --hidden -r 2+6 |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
183 x 4538525df7e2 (2) add c |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
184 pruned using pick by test (Thu Jan 01 00:00:00 1970 +0000) |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
185 |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
186 @ c4636a81ebeb (6) add c |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
187 |
a9929dd36405
pick: don't create any successors when there were no changes (issue6093)
Anton Shestakov <av6@dwimlabs.net>
parents:
4800
diff
changeset
|
188 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
189 interrupted pick |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
190 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
191 $ hg up d46dc301d92f |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
192 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
|
193 $ echo foo > c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
194 $ 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
|
195 $ 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
|
196 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
|
197 merging c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
198 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
|
199 unresolved merge conflicts (see hg help resolve) |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
200 [240] |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
201 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
202 $ echo foobar > c |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
203 $ 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
|
204 (no more unresolved files) |
4052
73e73471d6c6
pick: replace "grabstate" with "pickstate"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4049
diff
changeset
|
205 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
|
206 $ 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
|
207 $ hg glog |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
208 @ 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
|
209 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
210 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
|
211 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
212 | 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
|
213 |/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
214 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
|
215 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
216 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
|
217 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
218 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
|
219 |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
220 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
221 When interrupted pick results in 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
|
222 |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
223 $ hg up d46dc301d92f |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
224 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
|
225 $ echo bar > c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
226 $ hg add c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
227 $ 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
|
228 created new head |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
229 |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
230 $ hg up 44e155eb95c7 |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
231 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
|
232 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
233 $ 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
|
234 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
|
235 merging c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
236 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
|
237 unresolved merge conflicts (see hg help resolve) |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
238 [240] |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
239 $ echo foobar > c |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
240 $ hg resolve -m |
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
241 (no more unresolved files) |
4052
73e73471d6c6
pick: replace "grabstate" with "pickstate"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4049
diff
changeset
|
242 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
|
243 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
244 $ 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
|
245 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
|
246 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
247 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
|
248 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
249 $ echo foo > b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
250 $ 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
|
251 $ 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
|
252 @ 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
|
253 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
254 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
|
255 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
256 ~ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
257 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
258 $ 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
|
259 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
|
260 merging b |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
261 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
|
262 unresolved merge conflicts (see hg help resolve) |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
263 [240] |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
264 |
4800
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
265 #if abortcommand |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
266 $ hg abort --dry-run |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
267 pick in progress, will be aborted |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
268 #endif |
fa534a8c5863
pick: added support for hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents:
4687
diff
changeset
|
269 $ hg 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
|
270 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
|
271 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
272 $ hg glog |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
273 @ 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
|
274 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
275 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
|
276 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
277 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
|
278 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
279 | 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
|
280 |/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
281 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
|
282 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
283 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
|
284 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
285 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
|
286 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
287 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
288 Trying to pick a public changeset |
3453
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
289 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
290 $ 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
|
291 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
292 $ 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
|
293 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
|
294 (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
|
295 [255] |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
296 |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
297 $ hg glog |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
298 @ 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
|
299 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
300 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
|
301 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
302 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
|
303 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
304 | 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
|
305 |/ |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
306 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
|
307 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
308 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
|
309 | |
32ed5b6fadd3
grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
310 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
|
311 |
4484
302cd64f71e1
tests: rename test-grab to test-pick
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4232
diff
changeset
|
312 Checking phase preservation while picking secret changeset |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
313 |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
314 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
|
315 |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
316 $ 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
|
317 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
318 $ 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
|
319 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
|
320 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
|
321 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
|
322 unresolved merge conflicts (see hg help resolve) |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
323 [240] |
3474
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
324 |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
325 $ 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
|
326 $ 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
|
327 (no more unresolved files) |
4052
73e73471d6c6
pick: replace "grabstate" with "pickstate"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4049
diff
changeset
|
328 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
|
329 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
330 $ 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
|
331 $ 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
|
332 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
|
333 |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
334 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
|
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 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
|
337 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
|
338 $ 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
|
339 $ 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
|
340 $ 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
|
341 |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
342 $ 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
|
343 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
|
344 |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
345 $ hg glog |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
346 @ 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
|
347 | |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
348 | 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
|
349 | | |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
350 | 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
|
351 | | |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
352 | 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
|
353 | | |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
354 | 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
|
355 |/ |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
356 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
|
357 | |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
358 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
|
359 | |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
360 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
|
361 |
3526
df20ddc79064
grab: move the initialization of pctx variable outside of if-else
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3522
diff
changeset
|
362 $ 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
|
363 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
|
364 |
4053
ecbf61d90807
pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4052
diff
changeset
|
365 $ 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
|
366 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
|
367 |
05fe5239fca2
tests: add a test showing grabbing of secret changeset turn it into draft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3473
diff
changeset
|
368 $ 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
|
369 13: secret |
4485
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
370 $ cd .. |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
371 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
372 Check pick behavior regarding working copy branch (issue6089) |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
373 ------------------------------------------------------------- |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
374 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
375 The branch of the picked changeset should be preserved, and the working copy updated |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
376 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
377 $ hg init issue6089 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
378 $ cd issue6089 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
379 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
380 $ touch a |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
381 $ hg add a |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
382 $ hg ci -m 'first commit on default' |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
383 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
384 $ hg branch foo |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
385 marked working directory as branch foo |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
386 (branches are permanent and global, did you want a bookmark?) |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
387 $ touch b |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
388 $ hg add b |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
389 $ hg ci -m 'first commit on foo' |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
390 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
391 $ hg up default |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
392 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
393 $ echo test > a |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
394 $ hg ci -m 'second commit on default' |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
395 $ hg log -G --template '{node|short}: {branch}\n' --rev 'all()+wdir()' |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
396 o ffffffffffff: default |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
397 | |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
398 @ 5f07cbf7d111: default |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
399 | |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
400 | o 96bb2057779e: foo |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
401 |/ |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
402 o d03a6bcc83cd: default |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
403 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
404 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
405 $ hg pick 1 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
406 picking 1:96bb2057779e "first commit on foo" |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
407 $ hg log --template '{branch}\n' -r tip |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
408 foo |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
409 $ hg branch |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
410 foo |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
411 $ hg log -G --template '{node|short}: {branch}\n' --rev 'all()+wdir()' |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
412 o ffffffffffff: foo |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
413 | |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
414 @ 5344a77549bd: foo |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
415 | |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
416 o 5f07cbf7d111: default |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
417 | |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
418 o d03a6bcc83cd: default |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
419 |
e3785a8d0712
pick: update working dir branch (issue6089)
Manuel Jacob <me@manueljacob.de>
parents:
4484
diff
changeset
|
420 $ cd .. |
4686
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
421 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
422 Check that pick doesn't drop files after conflicts occur (issue6037) |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
423 -------------------------------------------------------------------- |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
424 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
425 $ hg init issue6037 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
426 $ cd issue6037 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
427 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
428 $ echo apple > a |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
429 $ hg ci -qAm 'apple' |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
430 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
431 $ echo apricot > a |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
432 $ echo banana > b |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
433 $ hg ci -qAm 'apricot and banana' |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
434 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
435 $ echo avocado > a |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
436 $ hg ci -m 'avocado' |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
437 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
438 $ hg glf |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
439 @ 2: avocado (a) |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
440 | |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
441 o 1: apricot and banana (a b) |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
442 | |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
443 o 0: apple (a) |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
444 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
445 Now let's change order of 1 and 2 using pick command |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
446 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
447 $ hg up -r 0 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
448 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
449 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
450 We avoid merge conflict here just to make the test shorter |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
451 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
452 $ hg pick -r 2 --tool :other |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
453 picking 2:f08a1e4a33c4 "avocado" |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
454 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
455 Now we pick revision 1 that touches two files (a and b), merge conflict is expected |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
456 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
457 $ hg pick -r 1 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
458 picking 1:892e123ebf62 "apricot and banana" |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
459 merging a |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
460 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
461 unresolved merge conflicts (see hg help resolve) |
5666
e5d91fd1f319
tests: update with more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
462 [240] |
4686
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
463 $ hg resolve -t :other a |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
464 (no more unresolved files) |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
465 continue: hg pick --continue |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
466 $ hg pick --continue |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
467 |
4687
313565dd75e3
pick: remove transaction on the whole command (issue6037)
Anton Shestakov <av6@dwimlabs.net>
parents:
4686
diff
changeset
|
468 Demonstrate that b was not forgotten and is definitely included in 4 |
4686
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
469 |
4687
313565dd75e3
pick: remove transaction on the whole command (issue6037)
Anton Shestakov <av6@dwimlabs.net>
parents:
4686
diff
changeset
|
470 $ hg status b -A |
313565dd75e3
pick: remove transaction on the whole command (issue6037)
Anton Shestakov <av6@dwimlabs.net>
parents:
4686
diff
changeset
|
471 C b |
4686
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
472 $ hg glf |
4687
313565dd75e3
pick: remove transaction on the whole command (issue6037)
Anton Shestakov <av6@dwimlabs.net>
parents:
4686
diff
changeset
|
473 @ 4: apricot and banana (a b) |
4686
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
474 | |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
475 o 3: avocado (a) |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
476 | |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
477 o 0: apple (a) |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
478 |
f1466f5ffbf5
tests: demonstrate hg pick forgetting files after conflicts
Anton Shestakov <av6@dwimlabs.net>
parents:
4491
diff
changeset
|
479 $ cd .. |