Mercurial > hg
annotate tests/test-obsmarkers-effectflag.t @ 40417:49c7b701fdc2 stable
phase: add an archived phase
This phase allows for hidden changesets in the "user space". It differs from
the "internal" phase which is intended for internal by-product only. There
have been discussions at the 4.8 sprint to use such phase to speedup cleanup
after history rewriting operation.
Shipping it in the same release as the 'internal-phase' groups the associated
`requires` entry. The important bit is to have support for this phase in the
earliest version of mercurial possible. Adding the UI to manipulate this new
phase later seems fine.
The current plan for archived usage and user interface are as follow. On a
repository with internal-phase on and evolution off:
* history rewriting command set rewritten changeset in the archived phase.
(This mean updating the cleanupnodes method).
* keep `hg unbundle .hg/strip-backup/X.hg` as a way to restore changeset for
now
(backup bundle need to contains phase data)
* [maybe] add a `hg strip --soft` advance flag
(a light way to expose the feature without getting in the way of a better
UI)
Mercurial 4.8 freeze is too close to get the above in by then.
We don't introduce a new repository `requirement` as we reuse the one
introduced with the 'archived' phase during the 4.8 cycle.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 17 Oct 2018 14:47:01 +0200 |
parents | cc977ec0b8b9 |
children | f90a5c211251 |
rev | line source |
---|---|
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 Test the 'effect-flags' feature |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 Global setup |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 ============ |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 $ . $TESTDIR/testlib/obsmarker-common.sh |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 $ cat >> $HGRCPATH <<EOF |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 > [ui] |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 > interactive = true |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 > [phases] |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 > publish=False |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 > [extensions] |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 > rebase = |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 > [experimental] |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 > evolution = all |
34902
cc977ec0b8b9
config: also gather effect-flags on experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents:
34421
diff
changeset
|
16 > evolution.effect-flags = 1 |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 > EOF |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 $ hg init $TESTTMP/effect-flags |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 $ cd $TESTTMP/effect-flags |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 $ mkcommit ROOT |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 amend touching the description only |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 ----------------------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 $ mkcommit A0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 $ hg commit --amend -m "A1" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 $ hg debugobsolete --rev . |
34415
51aadc0d0da2
effectflag: detect when description changed
Boris Feld <boris.feld@octobus.net>
parents:
34414
diff
changeset
|
32 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 amend touching the user only |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 ---------------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 $ mkcommit B0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 $ hg commit --amend -u "bob <bob@bob.com>" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 $ hg debugobsolete --rev . |
34416
55ef17ec8e59
effectflag: detect when user changed
Boris Feld <boris.feld@octobus.net>
parents:
34415
diff
changeset
|
43 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 amend touching the date only |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 ---------------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 $ mkcommit B1 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 $ hg commit --amend -d "42 0" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 $ hg debugobsolete --rev . |
34417
54af8de9bd09
effectflag: detect when date changed
Boris Feld <boris.feld@octobus.net>
parents:
34416
diff
changeset
|
54 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 amend touching the branch only |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 ---------------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 $ mkcommit B2 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 $ hg branch my-branch |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 marked working directory as branch my-branch |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 (branches are permanent and global, did you want a bookmark?) |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 $ hg commit --amend |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 $ hg debugobsolete --rev . |
34418
57980af73cfa
effectflag: detect when branch changed
Boris Feld <boris.feld@octobus.net>
parents:
34417
diff
changeset
|
68 bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 $ hg up default |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 rebase (parents change) |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 ----------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 $ mkcommit C0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
77 $ mkcommit D0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 $ hg rebase -r . -d 'desc(B0)' |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
79 rebasing 10:c85eff83a034 "D0" (tip) |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 $ hg debugobsolete --rev . |
34419
fa26f5891e68
effectflag: detect when parents changed
Boris Feld <boris.feld@octobus.net>
parents:
34418
diff
changeset
|
84 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 amend touching the diff |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 ----------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
89 $ mkcommit E0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 $ echo 42 >> E0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
91 $ hg commit --amend |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
92 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
93 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
95 $ hg debugobsolete --rev . |
34421
187bc224554a
effectflag: detect when diff changed
Boris Feld <boris.feld@octobus.net>
parents:
34420
diff
changeset
|
96 ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
97 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
98 amend with multiple effect (desc and meta) |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
99 ------------------------------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 $ mkcommit F0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
102 $ hg branch my-other-branch |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
103 marked working directory as branch my-other-branch |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
104 $ hg commit --amend -m F1 -u "bob <bob@bob.com>" -d "42 0" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
105 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
106 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
107 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 $ hg debugobsolete --rev . |
34418
57980af73cfa
effectflag: detect when branch changed
Boris Feld <boris.feld@octobus.net>
parents:
34417
diff
changeset
|
109 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'operation': 'amend', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
110 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
111 rebase not touching the diff |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
112 ---------------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
113 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
114 $ cat << EOF > H0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
115 > 0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
116 > 1 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
117 > 2 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
118 > 3 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
119 > 4 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
120 > 5 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
121 > 6 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
122 > 7 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
123 > 8 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
124 > 9 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
125 > 10 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
126 > EOF |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
127 $ hg add H0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
128 $ hg commit -m 'H0' |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
129 $ echo "H1" >> H0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
130 $ hg commit -m "H1" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
131 $ hg up -r "desc(H0)" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
132 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
133 $ cat << EOF > H0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
134 > H2 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
135 > 0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
136 > 1 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
137 > 2 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
138 > 3 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
139 > 4 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 > 5 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
141 > 6 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 > 7 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
143 > 8 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
144 > 9 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 > 10 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
146 > EOF |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
147 $ hg commit -m "H2" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
148 created new head |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
149 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 rebasing 17:b57fed8d8322 "H1" |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 merging H0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 $ hg debugobsolete -r tip |
34419
fa26f5891e68
effectflag: detect when parents changed
Boris Feld <boris.feld@octobus.net>
parents:
34418
diff
changeset
|
153 b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
34414
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
154 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
155 amend closing the branch should be detected as meta change |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
156 ---------------------------------------------------------- |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 $ hg branch closedbranch |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 marked working directory as branch closedbranch |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 $ mkcommit G0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
161 $ mkcommit I0 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 $ hg commit --amend --close-branch |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 check result |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 |
468646386e95
tests: add tests for effect flags
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
166 $ hg debugobsolete -r . |
34420
95759620d492
effectflag: detect when meta changed
Boris Feld <boris.feld@octobus.net>
parents:
34419
diff
changeset
|
167 2f599e54c1c6974299065cdf54e1ad640bfb7b5d 12c6238b5e371eea00fd2013b12edce3f070928b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'amend', 'user': 'test'} |