author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Thu, 25 Oct 2018 12:52:34 +0200 | |
branch | stable |
changeset 4195 | 4803bfe8db17 |
parent 3559 | d166b3dc5e8a |
child 3591 | 98941c28f3e2 |
child 5123 | 900668a93629 |
permissions | -rw-r--r-- |
2446
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 |
Test the 'effect-flags' feature |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
|
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
Global setup |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
============ |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
|
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 |
$ . $TESTDIR/testlib/common.sh |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
$ cat >> $HGRCPATH <<EOF |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
> [ui] |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 |
> interactive = true |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 |
> [phases] |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
> publish=False |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 |
> [extensions] |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 |
> evolve = |
2449
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
14 |
> rebase = |
2446
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 |
> [experimental] |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 |
> evolution.effect-flags = 1 |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 |
> EOF |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 |
|
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 |
$ hg init $TESTTMP/effect-flags |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 |
$ cd $TESTTMP/effect-flags |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
$ mkcommit ROOT |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
|
2447
631ccf45f0bb
effect-flag: rework existing test to prepare for mor tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2446
diff
changeset
|
23 |
amend touching the description only |
631ccf45f0bb
effect-flag: rework existing test to prepare for mor tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2446
diff
changeset
|
24 |
----------------------------------- |
2446
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 |
|
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 |
$ mkcommit A0 |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
$ hg amend -m "A1" |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 |
|
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
check result |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
|
2447
631ccf45f0bb
effect-flag: rework existing test to prepare for mor tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2446
diff
changeset
|
31 |
$ hg debugobsolete --rev . |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
32 |
471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
2446
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
$ hg obslog . |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 |
@ fdf9bde5129a (2) A1 |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
| |
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
x 471f378eab4c (1) A0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
37 |
rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
2446
4b2f4da124a2
effectflag: allow to save effect of change in obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
39 |
$ hg log --hidden -r "desc(A0)" |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
40 |
changeset: 1:471f378eab4c |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
41 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
42 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
43 |
obsolete: reworded using amend as 2:fdf9bde5129a |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
44 |
summary: A0 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
45 |
|
2448
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
46 |
|
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
47 |
amend touching the user only |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
48 |
---------------------------- |
2448
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
49 |
|
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
50 |
$ mkcommit B0 |
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
51 |
$ hg amend -u "bob <bob@bob.com>" |
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
52 |
|
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
53 |
check result |
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
54 |
|
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
55 |
$ hg debugobsolete --rev . |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
56 |
ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'} |
2448
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
57 |
$ hg obslog . |
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
58 |
@ 5485c92d3433 (4) B0 |
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
59 |
| |
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
60 |
x ef4a313b1e0a (3) B0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
61 |
rewritten(user) as 5485c92d3433 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
62 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
63 |
$ hg log --hidden -r "ef4a313b1e0a" |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
64 |
changeset: 3:ef4a313b1e0a |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
65 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
66 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
67 |
obsolete: reauthored using amend as 4:5485c92d3433 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
68 |
summary: B0 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
69 |
|
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
70 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
71 |
amend touching the date only |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
72 |
---------------------------- |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
73 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
74 |
$ mkcommit B1 |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
75 |
$ hg amend -d "42 0" |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
76 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
77 |
check result |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
78 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
79 |
$ hg debugobsolete --rev . |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
80 |
2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'} |
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
81 |
$ hg obslog . |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
82 |
@ 4dd84345082e (6) B1 |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
83 |
| |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
84 |
x 2ef0680ff450 (5) B1 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
85 |
rewritten(date) as 4dd84345082e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
2448
66f05d5f4769
effectflag: detect meta changes
Boris Feld <boris.feld@octobus.net>
parents:
2447
diff
changeset
|
86 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
87 |
$ hg log --hidden -r "2ef0680ff450" |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
88 |
changeset: 5:2ef0680ff450 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
89 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
90 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
91 |
obsolete: date-changed using amend as 6:4dd84345082e |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
92 |
summary: B1 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
93 |
|
2453
ad08aedf25ac
obshistory: display informations from the obs marker effect flag
Boris Feld <boris.feld@octobus.net>
parents:
2452
diff
changeset
|
94 |
|
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
95 |
amend touching the branch only |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
96 |
---------------------------- |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
97 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
98 |
$ mkcommit B2 |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
99 |
$ hg branch my-branch |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
100 |
marked working directory as branch my-branch |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
101 |
(branches are permanent and global, did you want a bookmark?) |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
102 |
$ hg amend |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
103 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
104 |
check result |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
105 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
106 |
$ hg debugobsolete --rev . |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
107 |
bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'} |
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
108 |
$ hg obslog . |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
109 |
@ 14a01456e057 (8) B2 |
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
110 |
| |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
111 |
x bd3db8264cee (7) B2 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
112 |
rewritten(branch) as 14a01456e057 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
113 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
114 |
$ hg log --hidden -r "bd3db8264cee" |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
115 |
changeset: 7:bd3db8264cee |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
116 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
117 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
118 |
obsolete: branch-changed using amend as 8:14a01456e057 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
119 |
summary: B2 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
120 |
|
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
121 |
|
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
122 |
$ hg up default |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
123 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
124 |
|
2449
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
125 |
rebase (parents change) |
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
126 |
----------------------- |
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
127 |
|
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
128 |
$ mkcommit C0 |
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
129 |
$ mkcommit D0 |
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
130 |
$ hg rebase -r . -d 'desc(B0)' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
131 |
rebasing 10:c85eff83a034 "D0" (tip) |
2449
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
132 |
|
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
133 |
check result |
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
134 |
|
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
135 |
$ hg debugobsolete --rev . |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
136 |
c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
2449
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
137 |
$ hg obslog . |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
138 |
@ da86aa2f19a3 (11) D0 |
2449
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
139 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
140 |
x c85eff83a034 (10) D0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
141 |
rewritten(parent) as da86aa2f19a3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
2449
0b05142117d2
effectflag: detect parent change
Boris Feld <boris.feld@octobus.net>
parents:
2448
diff
changeset
|
142 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
143 |
$ hg log --hidden -r "c85eff83a034" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
144 |
changeset: 10:c85eff83a034 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
145 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
146 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
147 |
obsolete: rebased using rebase as 11:da86aa2f19a3 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
148 |
summary: D0 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
149 |
|
2450
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
150 |
|
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
151 |
amend touching the diff |
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
152 |
----------------------- |
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
153 |
|
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
154 |
$ mkcommit E0 |
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
155 |
$ echo 42 >> E0 |
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
156 |
$ hg amend |
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
157 |
|
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
158 |
check result |
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
159 |
|
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
160 |
$ hg debugobsolete --rev . |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
161 |
ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
2450
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
162 |
$ hg obslog . |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
163 |
@ 75781fdbdbf5 (13) E0 |
2450
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
164 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
165 |
x ebfe0333e0d9 (12) E0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
166 |
rewritten(content) as 75781fdbdbf5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
2450
98613938d098
effectflag: basic diff change detection
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2449
diff
changeset
|
167 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
168 |
$ hg log --hidden -r "ebfe0333e0d9" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
169 |
changeset: 12:ebfe0333e0d9 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
170 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
171 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
172 |
obsolete: amended using amend as 13:75781fdbdbf5 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
173 |
summary: E0 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
174 |
|
2451
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
175 |
|
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
176 |
amend with multiple effect (desc and meta) |
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
177 |
------------------------------------------- |
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
178 |
|
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
179 |
$ mkcommit F0 |
2492
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
180 |
$ hg branch my-other-branch |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
181 |
marked working directory as branch my-other-branch |
c9f1118b33d6
effectflag: split effect flag meta
Boris Feld <boris.feld@octobus.net>
parents:
2453
diff
changeset
|
182 |
$ hg amend -m F1 -u "bob <bob@bob.com>" -d "42 0" |
2451
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
183 |
|
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
184 |
check result |
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
185 |
|
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
186 |
$ hg debugobsolete --rev . |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
187 |
fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'operation': 'amend', 'user': 'test'} |
2451
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
188 |
$ hg obslog . |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
189 |
@ a94e0fd5f1c8 (15) F1 |
2451
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
190 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
191 |
x fad47e5bd78e (14) F0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
192 |
rewritten(description, user, date, branch) as a94e0fd5f1c8 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
2451
5dc7294327ed
effectflag: add test combining multiple flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2450
diff
changeset
|
193 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
194 |
$ hg log --hidden -r "fad47e5bd78e" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
195 |
changeset: 14:fad47e5bd78e |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
196 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
197 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
198 |
obsolete: rewritten using amend as 15:a94e0fd5f1c8 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
199 |
summary: F0 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
200 |
|
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
201 |
|
2519
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
202 |
rebase not touching the diff |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
203 |
---------------------------- |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
204 |
|
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
205 |
$ cat << EOF > H0 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
206 |
> 0 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
207 |
> 1 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
208 |
> 2 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
209 |
> 3 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
210 |
> 4 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
211 |
> 5 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
212 |
> 6 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
213 |
> 7 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
214 |
> 8 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
215 |
> 9 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
216 |
> 10 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
217 |
> EOF |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
218 |
$ hg add H0 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
219 |
$ hg commit -m 'H0' |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
220 |
$ echo "H1" >> H0 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
221 |
$ hg commit -m "H1" |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
222 |
$ hg up -r "desc(H0)" |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
223 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
224 |
$ cat << EOF > H0 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
225 |
> H2 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
226 |
> 0 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
227 |
> 1 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
228 |
> 2 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
229 |
> 3 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
230 |
> 4 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
231 |
> 5 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
232 |
> 6 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
233 |
> 7 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
234 |
> 8 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
235 |
> 9 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
236 |
> 10 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
237 |
> EOF |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
238 |
$ hg commit -m "H2" |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
239 |
created new head |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
240 |
$ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
241 |
rebasing 17:b57fed8d8322 "H1" |
2519
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
242 |
merging H0 |
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
243 |
$ hg obslog tip |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
244 |
o e509e2eb3df5 (19) H1 |
2519
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
245 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
246 |
x b57fed8d8322 (17) H1 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
247 |
rewritten(parent) as e509e2eb3df5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
2519
4b2e9674c0b7
effectflag: add a test for content detection
Boris Feld <boris.feld@octobus.net>
parents:
2518
diff
changeset
|
248 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
249 |
$ hg log --hidden -r "b57fed8d8322" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
250 |
changeset: 17:b57fed8d8322 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
251 |
branch: my-other-branch |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
252 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
253 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
254 |
obsolete: rebased using rebase as 19:e509e2eb3df5 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
255 |
summary: H1 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
256 |
|
2522
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
257 |
amend closing the branch should be detected as meta change |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
258 |
---------------------------------------------------------- |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
259 |
|
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
260 |
$ hg branch closedbranch |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
261 |
marked working directory as branch closedbranch |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
262 |
$ mkcommit G0 |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
263 |
$ mkcommit I0 |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
264 |
$ hg commit --amend --close-branch |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
265 |
|
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
266 |
check result |
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
267 |
|
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
268 |
$ hg obslog . |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
269 |
@ 12c6238b5e37 (22) I0 |
2522
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
270 |
| |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
271 |
x 2f599e54c1c6 (21) I0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3520
diff
changeset
|
272 |
rewritten(meta) as 12c6238b5e37 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
2522
a1cc2a0b9f6f
effetflag: detect other meta (extra) changes
Boris Feld <boris.feld@octobus.net>
parents:
2520
diff
changeset
|
273 |
|
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
274 |
$ hg log --hidden -r "2f599e54c1c6" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
275 |
changeset: 21:2f599e54c1c6 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
276 |
branch: closedbranch |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
277 |
user: test |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
278 |
date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
279 |
obsolete: meta-changed using amend as 22:12c6238b5e37 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
280 |
summary: I0 |
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
281 |