author | Bryan O'Sullivan <bos@serpentine.com> |
Sun, 27 Dec 2015 23:55:54 +0900 | |
changeset 27524 | f5b6b4e574c1 |
parent 27406 | 11be6b7f95da |
child 27629 | e7ff83b2bcfe |
permissions | -rw-r--r-- |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
1 |
$ . "$TESTDIR/histedit-helpers.sh" |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
2 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
3 |
Enable obsolete |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
4 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
5 |
$ cat >> $HGRCPATH << EOF |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
6 |
> [ui] |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
7 |
> logtemplate= {rev}:{node|short} {desc|firstline} |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
8 |
> [phases] |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
9 |
> publish=False |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22392
diff
changeset
|
10 |
> [experimental] |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22392
diff
changeset
|
11 |
> evolution=createmarkers,allowunstable |
22392
2dd1cbee569d
tests: remove unnecessary apostrophe
David Soria Parra <davidsp@fb.com>
parents:
22260
diff
changeset
|
12 |
> [extensions] |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
13 |
> histedit= |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
14 |
> rebase= |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
15 |
> EOF |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
16 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
17 |
$ hg init base |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
18 |
$ cd base |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
19 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
20 |
$ for x in a b c d e f ; do |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
21 |
> echo $x > $x |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
22 |
> hg add $x |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
23 |
> hg ci -m $x |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
24 |
> done |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
25 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
26 |
$ hg log --graph |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
27 |
@ 5:652413bf663e f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
28 |
| |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
29 |
o 4:e860deea161a e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
30 |
| |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
31 |
o 3:055a42cdd887 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
32 |
| |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
33 |
o 2:177f92b77385 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
34 |
| |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
35 |
o 1:d2ae7f538514 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
36 |
| |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
37 |
o 0:cb9a9f314b8b a |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
38 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
39 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
40 |
$ HGEDITOR=cat hg histedit 1 |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
41 |
pick d2ae7f538514 1 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
42 |
pick 177f92b77385 2 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
43 |
pick 055a42cdd887 3 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
44 |
pick e860deea161a 4 e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
45 |
pick 652413bf663e 5 f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
46 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
47 |
# Edit history between d2ae7f538514 and 652413bf663e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
48 |
# |
20503
23dc77874191
histedit: clarify description of fold command
Adrian Zgorzałek <adek@fb.com>
parents:
19924
diff
changeset
|
49 |
# Commits are listed from least to most recent |
23dc77874191
histedit: clarify description of fold command
Adrian Zgorzałek <adek@fb.com>
parents:
19924
diff
changeset
|
50 |
# |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
51 |
# Commands: |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
52 |
# p, pick = use commit |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
53 |
# e, edit = use commit, but stop for amending |
20511
5840da876235
histedit: shorten new fold message
Matt Mackall <mpm@selenic.com>
parents:
20503
diff
changeset
|
54 |
# f, fold = use commit, but combine it with the one above |
22152
d2a5986cb89d
histedit: add "roll" command to fold commit data and drop message (issue4256)
Mike Edgar <adgar@google.com>
parents:
20511
diff
changeset
|
55 |
# r, roll = like fold, but discard this commit's description |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
56 |
# d, drop = remove commit from history |
26100
5706d130ec16
histedit: improve discoverability of edit commit message
timeless@mozdev.org
parents:
25894
diff
changeset
|
57 |
# m, mess = edit commit message without changing commit content |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
58 |
# |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
59 |
$ hg histedit 1 --commands - --verbose <<EOF | grep histedit |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
60 |
> pick 177f92b77385 2 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
61 |
> drop d2ae7f538514 1 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
62 |
> pick 055a42cdd887 3 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
63 |
> fold e860deea161a 4 e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
64 |
> pick 652413bf663e 5 f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
65 |
> EOF |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
66 |
[1] |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
67 |
$ hg log --graph --hidden |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
68 |
@ 10:cacdfd884a93 f |
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
69 |
| |
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
70 |
o 9:59d9f330561f d |
25809
ebb5bb9bc32e
histedit: mark temporary commits as obsolete when allowed to
Laurent Charignon <lcharignon@fb.com>
parents:
25412
diff
changeset
|
71 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
72 |
| x 8:b558abc46d09 fold-temp-revision e860deea161a |
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
73 |
| | |
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
74 |
| x 7:96e494a2d553 d |
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
75 |
|/ |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
76 |
o 6:b346ab9a313d c |
17759
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
77 |
| |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
78 |
| x 5:652413bf663e f |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
79 |
| | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
80 |
| x 4:e860deea161a e |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
81 |
| | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
82 |
| x 3:055a42cdd887 d |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
83 |
| | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
84 |
| x 2:177f92b77385 c |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
85 |
| | |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
86 |
| x 1:d2ae7f538514 b |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
87 |
|/ |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
88 |
o 0:cb9a9f314b8b a |
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
89 |
|
9c7497cd39fd
histedit: add obsolete support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
90 |
$ hg debugobsolete |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
91 |
96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 {b346ab9a313db8537ecf96fca3ca3ca984ef3bd7} (*) {'user': 'test'} (glob) |
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
92 |
b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 {96e494a2d553dd05902ba1cee1d94d4cb7b8faed} (*) {'user': 'test'} (glob) |
22260
2229d757802d
debugobsolete: display parents information from markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22220
diff
changeset
|
93 |
d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b} (*) {'user': 'test'} (glob) |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
94 |
177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (*) {'user': 'test'} (glob) |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
95 |
055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
96 |
e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22152
diff
changeset
|
97 |
652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 (*) {'user': 'test'} (glob) |
17771
dcfa526b180b
histedit: create obsolescence markers in deterministic order
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17764
diff
changeset
|
98 |
|
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
99 |
|
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
100 |
Ensure hidden revision does not prevent histedit |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
101 |
------------------------------------------------- |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
102 |
|
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
103 |
create an hidden revision |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
104 |
|
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
105 |
$ hg histedit 6 --commands - << EOF |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
106 |
> pick b346ab9a313d 6 c |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
107 |
> drop 59d9f330561f 7 d |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
108 |
> pick cacdfd884a93 8 f |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
109 |
> EOF |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
110 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
111 |
$ hg log --graph |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
112 |
@ 11:c13eb81022ca f |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
113 |
| |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
114 |
o 6:b346ab9a313d c |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
115 |
| |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
116 |
o 0:cb9a9f314b8b a |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
117 |
|
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
118 |
check hidden revision are ignored (6 have hidden children 7 and 8) |
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
119 |
|
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
120 |
$ hg histedit 6 --commands - << EOF |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
121 |
> pick b346ab9a313d 6 c |
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18398
diff
changeset
|
122 |
> pick c13eb81022ca 8 f |
17761
c80a7a0c7d22
histedit: ignores hidden revision when checking for orphaned nodes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17759
diff
changeset
|
123 |
> EOF |
17762
57f27cbfc5bb
histedit: refuse to edit public changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17761
diff
changeset
|
124 |
|
57f27cbfc5bb
histedit: refuse to edit public changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17761
diff
changeset
|
125 |
|
18165
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
126 |
|
18398
1a00c8451640
test: fix in-test comments related to obsolescence
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18165
diff
changeset
|
127 |
Test that rewriting leaving instability behind is allowed |
1a00c8451640
test: fix in-test comments related to obsolescence
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18165
diff
changeset
|
128 |
--------------------------------------------------------------------- |
18165
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
129 |
|
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
130 |
$ hg up '.^' |
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
131 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0f5a0a2073a8
histedit: allow operation from non-head if obsolete is enabled
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17771
diff
changeset
|
132 |
$ hg log -r 'children(.)' |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
133 |
11:c13eb81022ca f (no-eol) |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
134 |
$ hg histedit -r '.' --commands - <<EOF |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
135 |
> edit b346ab9a313d 6 c |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
136 |
> EOF |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
137 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
138 |
adding c |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18509
diff
changeset
|
139 |
Make changes as needed, you may commit or record as needed now. |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
140 |
When you are finished, run hg histedit --continue to resume. |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18934
diff
changeset
|
141 |
[1] |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
142 |
$ echo c >> c |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
143 |
$ hg histedit --continue |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
144 |
|
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
145 |
$ hg log -r 'unstable()' |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
146 |
11:c13eb81022ca f (no-eol) |
18438
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
147 |
|
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
148 |
stabilise |
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
149 |
|
81e77a8820f3
test-histedit: fix instability creation test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18437
diff
changeset
|
150 |
$ hg rebase -r 'unstable()' -d . |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
151 |
rebasing 11:c13eb81022ca "f" |
19924
c23c62209cc4
tests: prepare rebase test for wc parent preservation
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
19473
diff
changeset
|
152 |
$ hg up tip -q |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
153 |
|
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
154 |
check that extra has accumulated from histedit and rebase |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
155 |
|
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
156 |
$ hg log -T '{extras % "{key}={value}\n"}\n' -r tip |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
157 |
branch=default |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
158 |
histedit_source=cacdfd884a9321ec4e1de275ef3949fa953a1f83 |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
159 |
rebase_source=c13eb81022caa686a369223fe7f926bc4f7db576 |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
160 |
|
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
161 |
|
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
162 |
Test dropping of changeset on the top of the stack |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
163 |
------------------------------------------------------- |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
164 |
|
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
165 |
Nothing is rewritten below, the working directory parent must be change for the |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
166 |
dropped changeset to be hidden. |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
167 |
|
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
168 |
$ cd .. |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
169 |
$ hg clone base droplast |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
170 |
updating to branch default |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
171 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
172 |
$ cd droplast |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
173 |
$ hg histedit -r '40db8afa467b' --commands - << EOF |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
174 |
> pick 40db8afa467b 10 c |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
175 |
> drop 947ece25170f 11 f |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
176 |
> EOF |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
177 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
178 |
$ hg log -G |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
179 |
@ 12:40db8afa467b c |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
180 |
| |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
181 |
o 0:cb9a9f314b8b a |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
182 |
|
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
183 |
|
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
184 |
With rewritten ancestors |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
185 |
|
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
186 |
$ echo e > e |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
187 |
$ hg add e |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
188 |
$ hg commit -m g |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
189 |
$ echo f > f |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
190 |
$ hg add f |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
191 |
$ hg commit -m h |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18935
diff
changeset
|
192 |
$ hg histedit -r '40db8afa467b' --commands - << EOF |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
193 |
> pick 47a8561c0449 12 g |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
194 |
> pick 40db8afa467b 10 c |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
195 |
> drop 1b3b05f35ff0 13 h |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
196 |
> EOF |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
197 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
198 |
$ hg log -G |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
199 |
@ 17:ee6544123ab8 c |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
200 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
201 |
o 16:269e713e9eae g |
18509
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
202 |
| |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
203 |
o 0:cb9a9f314b8b a |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
204 |
|
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
205 |
$ cd ../base |
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
206 |
|
21daee53c101
test-histedit: add tests for dropping head changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18440
diff
changeset
|
207 |
|
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
208 |
|
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
209 |
Test phases support |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
210 |
=========================================== |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
211 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
212 |
Check that histedit respect immutability |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
213 |
------------------------------------------- |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
214 |
|
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
215 |
$ cat >> $HGRCPATH << EOF |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
216 |
> [ui] |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
217 |
> logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
218 |
> EOF |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
219 |
|
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
220 |
$ hg ph -pv '.^' |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
221 |
phase changed for 2 changesets |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
222 |
$ hg log -G |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
223 |
@ 13:947ece25170f (draft) f |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
224 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
225 |
o 12:40db8afa467b (public) c |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
226 |
| |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
227 |
o 0:cb9a9f314b8b (public) a |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
228 |
|
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
229 |
$ hg histedit -r '.~2' |
25411
d298805fb639
phases: rewrite "immutable changeset" to "public changeset"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24771
diff
changeset
|
230 |
abort: cannot edit public changeset: cb9a9f314b8b |
25412
443d4635e630
phases: add `hg help phases` hint to failures to edit public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
25411
diff
changeset
|
231 |
(see "hg help phases" for details) |
18439
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
232 |
[255] |
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
233 |
|
c6e3fa134da5
test-histedit: reorder phases test and prepare for more
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18438
diff
changeset
|
234 |
|
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
235 |
Prepare further testing |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
236 |
------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
237 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
238 |
$ for x in g h i j k ; do |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
239 |
> echo $x > $x |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
240 |
> hg add $x |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
241 |
> hg ci -m $x |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
242 |
> done |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
243 |
$ hg phase --force --secret .~2 |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
244 |
$ hg log -G |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
245 |
@ 18:14bda137d5b3 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
246 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
247 |
o 17:c62e7241a4f2 (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
248 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
249 |
o 16:9cd3934e05af (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
250 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
251 |
o 15:ee4a24fc4dfa (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
252 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
253 |
o 14:d22905de3528 (draft) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
254 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
255 |
o 13:947ece25170f (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
256 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
257 |
o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
258 |
| |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
259 |
o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
260 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
261 |
$ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
262 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
263 |
simple phase conservation |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
264 |
------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
265 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
266 |
Resulting changeset should conserve the phase of the original one whatever the |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
267 |
phases.new-commit option is. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
268 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
269 |
New-commit as draft (default) |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
270 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
271 |
$ cp -r base simple-draft |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
272 |
$ cd simple-draft |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
273 |
$ hg histedit -r '947ece25170f' --commands - << EOF |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
274 |
> edit 947ece25170f 11 f |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
275 |
> pick d22905de3528 12 g |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
276 |
> pick ee4a24fc4dfa 13 h |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
277 |
> pick 9cd3934e05af 14 i |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
278 |
> pick c62e7241a4f2 15 j |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
279 |
> pick 14bda137d5b3 16 k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
280 |
> EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
281 |
0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
282 |
adding f |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18509
diff
changeset
|
283 |
Make changes as needed, you may commit or record as needed now. |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
284 |
When you are finished, run hg histedit --continue to resume. |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18934
diff
changeset
|
285 |
[1] |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
286 |
$ echo f >> f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
287 |
$ hg histedit --continue |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
288 |
$ hg log -G |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
289 |
@ 24:12925f763c90 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
290 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
291 |
o 23:4545a6e77442 (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
292 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
293 |
o 22:d947a0798e76 (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
294 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
295 |
o 21:28fb35ae4ebb (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
296 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
297 |
o 20:10b22a5a9645 (draft) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
298 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
299 |
o 19:c5a1db4a69f5 (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
300 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
301 |
o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
302 |
| |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
303 |
o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
304 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
305 |
$ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
306 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
307 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
308 |
New-commit as draft (default) |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
309 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
310 |
$ cp -r base simple-secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
311 |
$ cd simple-secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
312 |
$ cat >> .hg/hgrc << EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
313 |
> [phases] |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
314 |
> new-commit=secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
315 |
> EOF |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
316 |
$ hg histedit -r '947ece25170f' --commands - << EOF |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
317 |
> edit 947ece25170f 11 f |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
318 |
> pick d22905de3528 12 g |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
319 |
> pick ee4a24fc4dfa 13 h |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
320 |
> pick 9cd3934e05af 14 i |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
321 |
> pick c62e7241a4f2 15 j |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
322 |
> pick 14bda137d5b3 16 k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
323 |
> EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
324 |
0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
325 |
adding f |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18509
diff
changeset
|
326 |
Make changes as needed, you may commit or record as needed now. |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
327 |
When you are finished, run hg histedit --continue to resume. |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18934
diff
changeset
|
328 |
[1] |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
329 |
$ echo f >> f |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
330 |
$ hg histedit --continue |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
331 |
$ hg log -G |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
332 |
@ 24:12925f763c90 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
333 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
334 |
o 23:4545a6e77442 (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
335 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
336 |
o 22:d947a0798e76 (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
337 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
338 |
o 21:28fb35ae4ebb (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
339 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
340 |
o 20:10b22a5a9645 (draft) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
341 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
342 |
o 19:c5a1db4a69f5 (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
343 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
344 |
o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
345 |
| |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
346 |
o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
347 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
348 |
$ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
349 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
350 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
351 |
Changeset reordering |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
352 |
------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
353 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
354 |
If a secret changeset is put before a draft one, all descendant should be secret. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
355 |
It seems more important to present the secret phase. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
356 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
357 |
$ cp -r base reorder |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
358 |
$ cd reorder |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
359 |
$ hg histedit -r '947ece25170f' --commands - << EOF |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
360 |
> pick 947ece25170f 11 f |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
361 |
> pick c62e7241a4f2 15 j |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
362 |
> pick d22905de3528 12 g |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
363 |
> pick 9cd3934e05af 14 i |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
364 |
> pick ee4a24fc4dfa 13 h |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
365 |
> pick 14bda137d5b3 16 k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
366 |
> EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
367 |
0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
368 |
$ hg log -G |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
369 |
@ 23:9e712162b2c1 (secret) k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
370 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
371 |
o 22:490861543602 (secret) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
372 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
373 |
o 21:86aeda50b70d (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
374 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
375 |
o 20:b2fa360bc090 (secret) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
376 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
377 |
o 19:e10fb4e3eb8e (secret) j |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
378 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
379 |
o 13:947ece25170f (draft) f |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
380 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
381 |
o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
382 |
| |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
383 |
o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
384 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
385 |
$ cd .. |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
386 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
387 |
Changeset folding |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
388 |
------------------------------------------- |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
389 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
390 |
Folding a secret changeset with a draft one turn the result secret (again, |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
391 |
better safe than sorry). Folding between same phase changeset still works |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
392 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
393 |
Note that there is a few reordering in this series for more extensive test |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
394 |
|
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
395 |
$ cp -r base folding |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
396 |
$ cd folding |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
397 |
$ cat >> .hg/hgrc << EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
398 |
> [phases] |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
399 |
> new-commit=secret |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
400 |
> EOF |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
401 |
$ hg histedit -r '947ece25170f' --commands - << EOF |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
402 |
> pick ee4a24fc4dfa 13 h |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
403 |
> fold 947ece25170f 11 f |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
404 |
> pick d22905de3528 12 g |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
405 |
> fold c62e7241a4f2 15 j |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
406 |
> pick 9cd3934e05af 14 i |
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
407 |
> fold 14bda137d5b3 16 k |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
408 |
> EOF |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
409 |
0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
410 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
411 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
412 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
413 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
414 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
415 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
416 |
$ hg log -G |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
417 |
@ 27:769e8ee8708e (secret) i |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
418 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
419 |
o 24:3de6dbab1b62 (secret) g |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
420 |
| |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
421 |
o 21:1d51647632b2 (draft) h |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
422 |
| |
26763
50fc80e46786
histedit: make histedit prune when obsolete is enabled
Durham Goode <durham@fb.com>
parents:
26100
diff
changeset
|
423 |
o 12:40db8afa467b (public) c |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
424 |
| |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
425 |
o 0:cb9a9f314b8b (public) a |
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
426 |
|
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
427 |
$ hg co 3de6dbab1b62 |
19473
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
428 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
429 |
$ echo wat >> wat |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
430 |
$ hg add wat |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
431 |
$ hg ci -m 'add wat' |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
432 |
created new head |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
433 |
$ hg merge 769e8ee8708e |
19473
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
434 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
435 |
(branch merge, don't forget to commit) |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
436 |
$ hg ci -m 'merge' |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
437 |
$ echo not wat > wat |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
438 |
$ hg ci -m 'modify wat' |
27146
88fde8db5307
rebase: propagate extra dict from rebase source changeset
Mike Edgar <adgar@google.com>
parents:
26763
diff
changeset
|
439 |
$ hg histedit 1d51647632b2 |
19473
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
440 |
abort: cannot edit history that contains merges |
10a0ae668fe6
histedit: refuse to edit history that contains merges (issue3962)
Augie Fackler <raf@durin42.com>
parents:
19019
diff
changeset
|
441 |
[255] |
18440
35513c59f376
histedit: proper phase conservation (issue3724)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18439
diff
changeset
|
442 |
$ cd .. |