author | Pierre-Yves David <pierre-yves.david@fb.com> |
Fri, 26 Jun 2015 00:07:13 -0700 | |
changeset 1462 | 5dfb18b98a55 |
parent 1412 | 8794a4680bdd |
child 1510 | b86eea66ed02 |
permissions | -rw-r--r-- |
1369
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
1 |
evolve --rev reordering |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
2 |
----------------------- |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
3 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
4 |
$ cat >> $HGRCPATH <<EOF |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
5 |
> [defaults] |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
6 |
> amend=-d "0 0" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
7 |
> fold=-d "0 0" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
8 |
> [web] |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
9 |
> push_ssl = false |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
10 |
> allow_push = * |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
11 |
> [phases] |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
12 |
> publish = False |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
13 |
> [diff] |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
14 |
> git = 1 |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
15 |
> unified = 0 |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
16 |
> [ui] |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
17 |
> logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
18 |
> [extensions] |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
19 |
> hgext.graphlog= |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
20 |
> EOF |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
21 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
22 |
$ mkcommit() { |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
23 |
> echo "$1" > "$1" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
24 |
> hg add "$1" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
25 |
> hg ci -m "add $1" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
26 |
> } |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
27 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
28 |
$ mkstack() { |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
29 |
> # Creates a stack of commit based on $1 with messages from $2, $3 .. |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
30 |
> hg update "$1" -C |
1369
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
31 |
> shift |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
32 |
> mkcommits $* |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
33 |
> } |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
34 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
35 |
$ mkcommits() { |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
36 |
> for i in $@; do mkcommit $i ; done |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
37 |
> } |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
38 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
39 |
Initial setup |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
40 |
$ hg init testrevorder |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
41 |
$ cd testrevorder |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
42 |
$ mkcommits p _a _b _c |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
43 |
$ hg phase --public 0 |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
44 |
$ hg up 'desc(_a)' |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
45 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
46 |
$ echo "aaa" > _a |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
47 |
$ hg amend |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
48 |
2 new unstable changesets |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
49 |
$ hg log -G |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
50 |
@ 5:12d519679175@default(draft) add _a |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
51 |
| |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
52 |
| o 3:4d156641b718@default(draft) add _c |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
53 |
| | |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
54 |
| o 2:4d7242ebb004@default(draft) add _b |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
55 |
| | |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
56 |
| x 1:2d73fcd7f07d@default(draft) add _a |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
57 |
|/ |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
58 |
o 0:f92638be10c7@default(public) add p |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
59 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
60 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
61 |
evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
62 |
$ hg evolve --rev 'desc(_c) + desc(_b)' |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
63 |
move:[2] add _b |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
64 |
atop:[5] add _a |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
65 |
move:[3] add _c |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
66 |
atop:[6] add _b |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
67 |
working directory is now at 52b8f9b04f83 |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
68 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
69 |
evolve --rev reorders the rev to solve instability. Harder case, obsolescence |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
70 |
accross three stacks in growing rev numbers. |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
71 |
$ hg up "desc(_c)" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
72 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
73 |
$ mkcommit _d |
1369
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
74 |
$ hg up "desc(_a)" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
75 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
76 |
$ hg amend -m "aprime" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
77 |
3 new unstable changesets |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
78 |
$ hg evolve --rev "desc(_b)" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
79 |
move:[6] add _b |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
80 |
atop:[9] aprime |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
81 |
working directory is now at 476c9c052aae |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
82 |
$ hg up "desc(_b) - obsolete()" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
83 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
84 |
$ hg amend -m "bprime" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
85 |
$ hg up "desc(aprime)" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
86 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
87 |
$ hg amend -m "asecond" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
88 |
1 new unstable changesets |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
89 |
$ hg log -G |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
90 |
@ 12:9a584314f3f3@default(draft) asecond |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
91 |
| |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
92 |
| o 11:a59c79776f7c@default(draft) bprime |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
93 |
| | |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
94 |
| x 9:81a687b96d4d@default(draft) aprime |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
95 |
|/ |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
96 |
| o 8:464731bc0ed0@default(draft) add _d |
1369
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
97 |
| | |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
98 |
| o 7:52b8f9b04f83@default(draft) add _c |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
99 |
| | |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
100 |
| x 6:59476c3836ef@default(draft) add _b |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
101 |
| | |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
102 |
| x 5:12d519679175@default(draft) add _a |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
103 |
|/ |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
104 |
o 0:f92638be10c7@default(public) add p |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
105 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
106 |
$ hg evolve --rev "unstable()" |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
107 |
move:[11] bprime |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
108 |
atop:[12] asecond |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
109 |
move:[7] add _c |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
110 |
atop:[13] bprime |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
111 |
move:[8] add _d |
1369
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
112 |
atop:[14] add _c |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
113 |
working directory is now at 225d2cc5d3fc |
1369
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
114 |
$ hg log -G |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
115 |
@ 15:225d2cc5d3fc@default(draft) add _d |
1369
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
116 |
| |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
117 |
o 14:0fc229278e4d@default(draft) add _c |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
118 |
| |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
119 |
o 13:c3741b9eafae@default(draft) bprime |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
120 |
| |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
121 |
o 12:9a584314f3f3@default(draft) asecond |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
122 |
| |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
123 |
o 0:f92638be10c7@default(public) add p |
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
124 |
|
4ed67cce8c23
evolve: properly evolve stacked unstable with --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
125 |
|
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
126 |
Evolve --rev more complex case: two sets of stacks one with prune an no successor, the other one |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
127 |
partially solvable |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
128 |
|
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
129 |
First set of stack: |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
130 |
$ mkstack "desc(_d)" c1_ c2_ c3_ c4_ >/dev/null |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
131 |
$ mkstack "desc(_d)" c1prime c2prime >/dev/null |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
132 |
$ mkstack "desc(_d)" c1second >/dev/null |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
133 |
$ hg prune "desc(c1_)" -s "desc(c1prime)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
134 |
1 changesets pruned |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
135 |
3 new unstable changesets |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
136 |
$ hg prune "desc(c2_)" -s "desc(c2prime)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
137 |
1 changesets pruned |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
138 |
$ hg prune "desc(c1prime)" -s "desc(c1second)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
139 |
1 changesets pruned |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
140 |
1 new unstable changesets |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
141 |
$ hg log -G -r "desc(_d)::" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
142 |
@ 22:a329855d0bc1@default(draft) add c1second |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
143 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
144 |
| o 21:072276ece1bf@default(draft) add c2prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
145 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
146 |
| x 20:f137acd06692@default(draft) add c1prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
147 |
|/ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
148 |
| o 19:0a1d9b2ce733@default(draft) add c4_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
149 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
150 |
| o 18:e2874f41c56c@default(draft) add c3_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
151 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
152 |
| x 17:3247c33339fa@default(draft) add c2_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
153 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
154 |
| x 16:df322257c182@default(draft) add c1_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
155 |
|/ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
156 |
o 15:225d2cc5d3fc@default(draft) add _d |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
157 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
158 |
|
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
159 |
Second set of stack with no successor for b2_: |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
160 |
$ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
161 |
$ mkstack "desc(_d)" b1prime b3prime >/dev/null |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
162 |
$ hg prune "desc(b1_)" -s "desc(b1prime)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
163 |
1 changesets pruned |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
164 |
3 new unstable changesets |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
165 |
$ hg prune "desc(b3_)" -s "desc(b3prime)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
166 |
1 changesets pruned |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
167 |
$ hg prune "desc(b2_)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
168 |
1 changesets pruned |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
169 |
|
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
170 |
$ hg log -G -r "desc(_d)::" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
171 |
@ 28:ba4c348b6d5e@default(draft) add b3prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
172 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
173 |
o 27:8fe985f5d0aa@default(draft) add b1prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
174 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
175 |
| o 26:1d9ba2e75c93@default(draft) add b4_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
176 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
177 |
| x 25:aec6a9657b6c@default(draft) add b3_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
178 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
179 |
| x 24:a69b58575918@default(draft) add b2_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
180 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
181 |
| x 23:3564eb18e448@default(draft) add b1_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
182 |
|/ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
183 |
| o 22:a329855d0bc1@default(draft) add c1second |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
184 |
|/ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
185 |
| o 21:072276ece1bf@default(draft) add c2prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
186 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
187 |
| x 20:f137acd06692@default(draft) add c1prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
188 |
|/ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
189 |
| o 19:0a1d9b2ce733@default(draft) add c4_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
190 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
191 |
| o 18:e2874f41c56c@default(draft) add c3_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
192 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
193 |
| x 17:3247c33339fa@default(draft) add c2_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
194 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
195 |
| x 16:df322257c182@default(draft) add c1_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
196 |
|/ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
197 |
o 15:225d2cc5d3fc@default(draft) add _d |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
198 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
199 |
|
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
200 |
Solve the full second stack and only part of the first one |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
201 |
$ echo "(desc(_d)::) - desc(c3_)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
202 |
(desc(_d)::) - desc(c3_) |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
203 |
$ hg evolve --rev "(desc(_d)::) - desc(c3_)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
204 |
cannot solve instability of 0a1d9b2ce733, skipping |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
205 |
move:[21] add c2prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
206 |
atop:[22] add c1second |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
207 |
move:[26] add b4_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
208 |
atop:[28] add b3prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
209 |
working directory is now at 4897c8ed7645 |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
210 |
|
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
211 |
Cleanup |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
212 |
$ hg evolve --rev "(desc(_d)::)" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
213 |
move:[18] add c3_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
214 |
atop:[29] add c2prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
215 |
move:[19] add c4_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
216 |
atop:[31] add c3_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
217 |
working directory is now at 4ee8feb52325 |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
218 |
$ hg log -G -r "desc(_d)::" |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
219 |
@ 32:4ee8feb52325@default(draft) add c4_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
220 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
221 |
o 31:08a530ce67e1@default(draft) add c3_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
222 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
223 |
| o 30:4897c8ed7645@default(draft) add b4_ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
224 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
225 |
o | 29:3abc7618dd5f@default(draft) add c2prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
226 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
227 |
| o 28:ba4c348b6d5e@default(draft) add b3prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
228 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
229 |
| o 27:8fe985f5d0aa@default(draft) add b1prime |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
230 |
| | |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
231 |
o | 22:a329855d0bc1@default(draft) add c1second |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
232 |
|/ |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
233 |
o 15:225d2cc5d3fc@default(draft) add _d |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
234 |
| |
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
235 |
|
1408
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
236 |
Test multiple revision with some un-evolvable because parent is splitted |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
237 |
------------------------------------------------------------------------ |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
238 |
|
1408
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
239 |
$ hg up 'desc(c2prime)' |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
240 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
241 |
$ mkcommit c3part1 |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
242 |
created new head |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
243 |
$ hg prev |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
244 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
245 |
[29] add c2prime |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
246 |
$ mkcommit c3part2 |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
247 |
created new head |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
248 |
$ hg prune -s 'desc(c3part1)' 'desc(c3_)' |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
249 |
1 changesets pruned |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
250 |
1 new unstable changesets |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
251 |
$ hg prune -s 'desc(c3part2)' 'desc(c3_)' |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
252 |
1 changesets pruned |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
253 |
2 new divergent changesets |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
254 |
$ hg up 'desc(b3prime)' |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
255 |
2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
256 |
$ hg amend -m 'b3second' |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
257 |
1 new unstable changesets |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
258 |
$ hg evolve --rev 'unstable()' |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
259 |
move:[30] add b4_ |
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
260 |
atop:[35] b3second |
1412
8794a4680bdd
evolve: warn about every skipped evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1408
diff
changeset
|
261 |
skipping 08a530ce67e1: divergent rewriting. can't choose destination |
1408
b3afdc0815d0
evolve: skip unstable changesets with multiple successorssets
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
262 |
working directory is now at a51a8a82fdba |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1369
diff
changeset
|
263 |