Mercurial > hg
annotate tests/test-histedit-base.t @ 31976:e0b6421b2fc5
obsolescence: add test for the "branch replacement" logic during push, case A3
Mercurial checks for the introduction of new heads on push. Evolution comes
into play to detect if existing branches on the server are being replaced by
some of the new one we push.
The current code for this logic is very basic (eg: issue4354) and was poorly
tested. We have a better implementation coming in the evolve extension fixing
these issues and with more serious tests coverage. In the process of upstreaming
this improved logic, we start with adding the test case that are already passing
with the current implementation. Once they are all in, we'll upstream the better
implementation and the extra test case.
See inline documentation for details about the test case added in this
changeset.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 13 Apr 2017 16:23:18 +0200 |
parents | 6d66200bff3b |
children | 270e344a6c74 |
rev | line source |
---|---|
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
1 $ . "$TESTDIR/histedit-helpers.sh" |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
2 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
4 > [alias] |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
5 > tglog = log -G --template "{rev}:{node}:{phase} '{desc}'\n" |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
6 > [extensions] |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
7 > histedit= |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
8 > [experimental] |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
9 > histeditng=True |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
10 > EOF |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
11 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
12 Create repo a: |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
13 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
14 $ hg init a |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
15 $ cd a |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
16 $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
17 adding changesets |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
18 adding manifests |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
19 adding file changes |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
20 added 8 changesets with 7 changes to 7 files (+2 heads) |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
21 (run 'hg heads' to see heads, 'hg merge' to merge) |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
22 $ hg up tip |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
23 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
24 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
25 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
26 @ 7:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
27 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
28 | o 6:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
29 |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
30 o | 5:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
31 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
32 | o 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
33 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
34 | o 3:32af7686d403cf45b5d95f2d70cebea587ac806a:draft 'D' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
35 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
36 | o 2:5fddd98957c8a54a4d436dfe1da9d87f21a1b97b:draft 'C' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
37 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
38 | o 1:42ccdea3bb16d28e1848c95fe2e44c000f3f21b1:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
39 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
40 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
41 |
29069
e2a1648a6ce7
tests: test histedit base command plan help
timeless <timeless@mozdev.org>
parents:
27955
diff
changeset
|
42 Verify that implicit base command and help are listed |
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
43 |
29069
e2a1648a6ce7
tests: test histedit base command plan help
timeless <timeless@mozdev.org>
parents:
27955
diff
changeset
|
44 $ HGEDITOR=cat hg histedit |grep base |
e2a1648a6ce7
tests: test histedit base command plan help
timeless <timeless@mozdev.org>
parents:
27955
diff
changeset
|
45 # b, base = checkout changeset and apply further changesets from there |
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
46 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
47 Go to D |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
48 $ hg update 3 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
49 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
50 edit the history to rebase B onto H |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
51 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
52 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
53 Rebase B onto H |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
54 $ hg histedit 1 --commands - 2>&1 << EOF | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
55 > base 02de42196ebe |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
56 > pick 42ccdea3bb16 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
57 > pick 5fddd98957c8 C |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
58 > pick 32af7686d403 D |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
59 > EOF |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
60 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
61 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
62 @ 7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
63 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
64 o 6:f778d1cbddac4ab679d9983c9bb92e4c5e09e7fa:draft 'C' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
65 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
66 o 5:3d41b7cc708545206213a842f96d812d2e73d818:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
67 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
68 o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
69 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
70 | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
71 |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
72 o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
73 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
74 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
75 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
76 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
77 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
78 Rebase back and drop something |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
79 $ hg histedit 5 --commands - 2>&1 << EOF | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
80 > base cd010b8cd998 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
81 > pick 3d41b7cc7085 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
82 > drop f778d1cbddac C |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
83 > pick 0937e82309df D |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
84 > EOF |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
85 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
86 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
87 @ 6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
88 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
89 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
90 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
91 | o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
92 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
93 | | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
94 | |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
95 | o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
96 |/ / |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
97 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
98 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
99 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
100 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
101 Split stack |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
102 $ hg histedit 5 --commands - 2>&1 << EOF | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
103 > base cd010b8cd998 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
104 > pick d273e35dcdf2 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
105 > base cd010b8cd998 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
106 > pick 476cc3e4168d D |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
107 > EOF |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
108 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
109 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
110 @ 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
111 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
112 | o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
113 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
114 | o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
115 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
116 | | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
117 | |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
118 | o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
119 |/ / |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
120 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
121 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
122 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
123 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
124 Abort |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
125 $ echo x > B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
126 $ hg add B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
127 $ hg commit -m "X" |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
128 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
129 @ 7:591369deedfdcbf57471e894999a70d7f676186d:draft 'X' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
130 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
131 o 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
132 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
133 | o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
134 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
135 | o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
136 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
137 | | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
138 | |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
139 | o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
140 |/ / |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
141 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
142 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
143 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
144 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
145 $ hg histedit 6 --commands - 2>&1 << EOF | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
146 > base d273e35dcdf2 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
147 > drop d7a6f907a822 D |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
148 > pick 591369deedfd X |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
149 > EOF |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
150 merging B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
151 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
27629
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27627
diff
changeset
|
152 Fix up the change (pick 591369deedfd) |
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27627
diff
changeset
|
153 (hg histedit --continue to resume) |
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
154 $ hg histedit --abort | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
155 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
156 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
157 @ 7:591369deedfdcbf57471e894999a70d7f676186d:draft 'X' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
158 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
159 o 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
160 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
161 | o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
162 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
163 | o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
164 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
165 | | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
166 | |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
167 | o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
168 |/ / |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
169 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
170 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
171 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
172 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
173 Continue |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
174 $ hg histedit 6 --commands - 2>&1 << EOF | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
175 > base d273e35dcdf2 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
176 > drop d7a6f907a822 D |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
177 > pick 591369deedfd X |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
178 > EOF |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
179 merging B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
180 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
27629
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27627
diff
changeset
|
181 Fix up the change (pick 591369deedfd) |
e7ff83b2bcfe
histedit: list action when intervention is required
timeless <timeless@mozdev.org>
parents:
27627
diff
changeset
|
182 (hg histedit --continue to resume) |
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
183 $ echo b2 > B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
184 $ hg resolve --mark B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
185 (no more unresolved files) |
27627
dcbba68e076f
histedit: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents:
27545
diff
changeset
|
186 continue: hg histedit --continue |
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
187 $ hg histedit --continue | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
188 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
189 @ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
190 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
191 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
192 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
193 | o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
194 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
195 | | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
196 | |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
197 | o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
198 |/ / |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
199 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
200 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
201 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
202 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
203 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
204 base on a previously picked changeset |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
205 $ echo i > i |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
206 $ hg add i |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
207 $ hg commit -m "I" |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
208 $ echo j > j |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
209 $ hg add j |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
210 $ hg commit -m "J" |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
211 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
212 @ 8:e8c55b19d366b335626e805484110d1d5f6f2ea3:draft 'J' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
213 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
214 o 7:b2f90fd8aa85db5569e3cfc30cd1d7739546368e:draft 'I' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
215 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
216 o 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
217 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
218 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
219 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
220 | o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
221 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
222 | | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
223 | |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
224 | o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
225 |/ / |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
226 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
227 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
228 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
229 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
230 $ hg histedit 5 --commands - 2>&1 << EOF | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
231 > pick d273e35dcdf2 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
232 > pick 03772da75548 X |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
233 > base d273e35dcdf2 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
234 > pick e8c55b19d366 J |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
235 > base d273e35dcdf2 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
236 > pick b2f90fd8aa85 I |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
237 > EOF |
29887
6d66200bff3b
histedit: correct output of error when 'base' is from the edit list
Augie Fackler <augie@google.com>
parents:
29069
diff
changeset
|
238 hg: parse error: base "d273e35dcdf2" changeset was an edited list candidate |
6d66200bff3b
histedit: correct output of error when 'base' is from the edit list
Augie Fackler <augie@google.com>
parents:
29069
diff
changeset
|
239 (base must only use unlisted changesets) |
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
240 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
241 $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
242 > base cd010b8cd998 A |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
243 > pick d273e35dcdf2 B |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
244 > pick 03772da75548 X |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
245 > pick b2f90fd8aa85 I |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
246 > pick e8c55b19d366 J |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
247 > EOF |
27545
a67d2e059a51
histedit: use parse-error exception for parsing
timeless <timeless@mozdev.org>
parents:
27406
diff
changeset
|
248 hg: parse error: unknown action "base" |
27085
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
249 |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
250 $ hg tglog |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
251 @ 8:e8c55b19d366b335626e805484110d1d5f6f2ea3:draft 'J' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
252 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
253 o 7:b2f90fd8aa85db5569e3cfc30cd1d7739546368e:draft 'I' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
254 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
255 o 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
256 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
257 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
258 | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
259 | o 4:02de42196ebee42ef284b6780a87cdc96e8eaab6:draft 'H' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
260 | | |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
261 | | o 3:eea13746799a9e0bfd88f29d3c2e9dc9389f524f:draft 'G' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
262 | |/| |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
263 | o | 2:24b6387c8c8cae37178880f3fa95ded3cb1cf785:draft 'F' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
264 |/ / |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
265 | o 1:9520eea781bcca16c1e15acc0ba14335a0e8e5ba:draft 'E' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
266 |/ |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
267 o 0:cd010b8cd998f3981a5a8115f94f8da4ab506089:draft 'A' |
d50ff8f4891f
histedit: add an experimental base action
Mateusz Kwapich <mitrandir@fb.com>
parents:
diff
changeset
|
268 |