mercurial: tests/test-rebase-cache.t@4f36738a869a (annotated)

12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	1	$ cat >> $HGRCPATH <<EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	2	> [extensions]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	3	> rebase=
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	4	> mq=
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	5	>
15742 65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15615 diff changeset	6	> [phases]
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15615 diff changeset	7	> publish=False
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15615 diff changeset	8	>
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	9	> [alias]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	10	> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	11	> theads = heads --template "{rev}: '{desc}' {branches}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	12	> EOF
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	13
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	14	$ hg init a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	15	$ cd a
11198 b345b1cc124f rebase: use helpers.sh in tests Matt Mackall <mpm@selenic.com> parents: 10547 diff changeset	16
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	17	$ echo a > a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	18	$ hg ci -Am A
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	19	adding a
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	20
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	21	$ hg branch branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	22	marked working directory as branch branch1
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	23	(branches are permanent and global, did you want a bookmark?)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	24	$ hg ci -m 'branch1'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	25
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	26	$ echo b > b
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	27	$ hg ci -Am B
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	28	adding b
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	29
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	30	$ hg up -q 0
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	31
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	32	$ hg branch branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	33	marked working directory as branch branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	34	$ hg ci -m 'branch2'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	35
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	36	$ echo c > C
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	37	$ hg ci -Am C
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	38	adding C
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	39
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	40	$ hg up -q 2
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	41
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	42	$ hg branch -f branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	43	marked working directory as branch branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	44	$ echo d > d
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	45	$ hg ci -Am D
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	46	adding d
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	47	created new head
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	48
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	49	$ echo e > e
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	50	$ hg ci -Am E
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	51	adding e
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	52
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	53	$ hg update default
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	54	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	55
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	56	$ hg branch branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	57	marked working directory as branch branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	58	$ hg ci -m 'branch3'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	59
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	60	$ echo f > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	61	$ hg ci -Am F
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	62	adding f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	63
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	64	$ cd ..
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	65
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	66
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	67	Rebase part of branch2 (5-6) onto branch3 (8):
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	68
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	69	$ hg clone -q -u . a a1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	70	$ cd a1
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	71
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17013 diff changeset	72	$ hg tglog
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	73	@ 8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	74	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	75	o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	76	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	77	\| o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	78	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	79	\| o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	80	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	81	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	82	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	83	+---o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	84	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	85	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	86	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	87	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	88	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	89	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	90
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	91	$ hg branches
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	92	branch3 8:4666b71e8e32
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	93	branch2 6:5097051d331d
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	94	branch1 2:0a03079c47fd (inactive)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	95	default 0:1994f17a630e (inactive)
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	96
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	97	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	98	8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	99	6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	100	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	101	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	102	0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	103
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	104	$ hg rebase -s 5 -d 8
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	105	rebasing 5:635859577d0b "D"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	106	rebasing 6:5097051d331d "E"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	107	saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-rebase.hg
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	108
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	109	$ hg branches
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	110	branch3 8:466cdfb14b62
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	111	branch2 4:e4fdb121d036
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	112	branch1 2:0a03079c47fd
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	113	default 0:1994f17a630e (inactive)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	114
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	115	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	116	8: 'E' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	117	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	118	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	119	0: 'A'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	120
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17013 diff changeset	121	$ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19324 diff changeset	122	o 8: 'E' branch3
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	123	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	124	o 7: 'D' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	125	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19324 diff changeset	126	@ 6: 'F' branch3
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	127	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	128	o 5: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	129	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	130	\| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	131	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	132	\| o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	133	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	134	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	135	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	136	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	137	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	138	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	139
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	140	$ cd ..
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	141
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	142
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	143	Rebase head of branch3 (8) onto branch2 (6):
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	144
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	145	$ hg clone -q -u . a a2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	146	$ cd a2
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	147
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	148	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	149	@ 8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	150	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	151	o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	152	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	153	\| o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	154	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	155	\| o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	156	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	157	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	158	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	159	+---o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	160	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	161	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	162	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	163	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	164	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	165	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	166
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	167	$ hg rebase -s 8 -d 6
45771 f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 40865 diff changeset	168	rebasing 8:4666b71e8e32 tip "F"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	169	saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	170
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	171	$ hg branches
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	172	branch2 8:6b4bdc1b5ac0
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	173	branch3 7:653b9feb4616
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	174	branch1 2:0a03079c47fd (inactive)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	175	default 0:1994f17a630e (inactive)
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	176
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	177	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	178	8: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	179	7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	180	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	181	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	182	0: 'A'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	183
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	184	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	185	@ 8: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	186	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	187	\| o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	188	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	189	o \| 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	190	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	191	o \| 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	192	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	193	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	194	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	195	\| \| o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	196	\| \|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	197	o \| 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	198	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	199	o \| 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	200	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	201	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	202
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	203	$ hg verify -q
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	204
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	205	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	206
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	207
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	208	Rebase entire branch3 (7-8) onto branch2 (6):
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	209
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	210	$ hg clone -q -u . a a3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	211	$ cd a3
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	212
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	213	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	214	@ 8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	215	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	216	o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	217	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	218	\| o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	219	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	220	\| o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	221	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	222	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	223	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	224	+---o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	225	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	226	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	227	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	228	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	229	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	230	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	231
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16913 diff changeset	232	$ hg rebase -s 7 -d 6
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	233	rebasing 7:653b9feb4616 "branch3"
40865 4edd427f34c1 rebase: clarify that commits that become empty are skipped Martin von Zweigbergk <martinvonz@google.com> parents: 40864 diff changeset	234	note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes
45771 f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 40865 diff changeset	235	rebasing 8:4666b71e8e32 tip "F"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	236	saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	237
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	238	$ hg branches
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	239	branch2 7:6b4bdc1b5ac0
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12640 diff changeset	240	branch1 2:0a03079c47fd (inactive)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	241	default 0:1994f17a630e (inactive)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	242
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	243	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	244	7: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	245	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	246	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	247	0: 'A'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	248
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17013 diff changeset	249	$ hg tglog
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	250	@ 7: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	251	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	252	o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	253	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	254	o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	255	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	256	\| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	257	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	258	\| o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	259	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	260	o \| 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	261	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	262	o \| 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	263	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	264	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	265
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	266	$ hg verify -q
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	267
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	268	Stripping multiple branches in one go bypasses the fast-case code to
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	269	update the branch cache.
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	270
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	271	$ hg strip 2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	272	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	273	saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	274
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	275	$ hg tglog
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	276	o 3: 'C' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	277	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	278	o 2: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	279	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	280	\| @ 1: 'branch1' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	281	\|/
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	282	o 0: 'A'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	283
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	284
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	285	$ hg branches
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	286	branch2 3:e4fdb121d036
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	287	branch1 1:63379ac49655
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	288	default 0:1994f17a630e (inactive)
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	289
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	290	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	291	3: 'C' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	292	1: 'branch1' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	293	0: 'A'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	294
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	295	Fast path branchcache code should not be invoked if branches stripped is not
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	296	the same as branches remaining.
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	297
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	298	$ hg init b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	299	$ cd b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	300
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	301	$ hg branch branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	302	marked working directory as branch branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	303	(branches are permanent and global, did you want a bookmark?)
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	304	$ hg ci -m 'branch1'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	305
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	306	$ hg branch branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	307	marked working directory as branch branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	308	$ hg ci -m 'branch2'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	309
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	310	$ hg branch -f branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	311	marked working directory as branch branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	312
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	313	$ echo a > A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	314	$ hg ci -Am A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	315	adding A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	316	created new head
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	317
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	318	$ hg tglog
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	319	@ 2: 'A' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	320	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	321	o 1: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	322	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	323	o 0: 'branch1' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	324
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	325
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	326	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	327	2: 'A' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	328	1: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	329
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	330	$ hg strip 2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	331	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	332	saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	333
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	334	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	335	1: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	336	0: 'branch1' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	337
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	338
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	339	Make sure requesting to strip a revision already stripped does not confuse things.
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	340	Try both orders.
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	341
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 15742 diff changeset	342	$ cd ..
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	343
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	344	$ hg init c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	345	$ cd c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	346
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	347	$ echo a > a
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	348	$ hg ci -Am A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	349	adding a
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	350	$ echo b > b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	351	$ hg ci -Am B
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	352	adding b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	353	$ echo c > c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	354	$ hg ci -Am C
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	355	adding c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	356	$ echo d > d
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	357	$ hg ci -Am D
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	358	adding d
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	359	$ echo e > e
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	360	$ hg ci -Am E
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	361	adding e
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	362
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	363	$ hg tglog
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	364	@ 4: 'E'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	365	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	366	o 3: 'D'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	367	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	368	o 2: 'C'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	369	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	370	o 1: 'B'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	371	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	372	o 0: 'A'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	373
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	374
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	375	$ hg strip 3 4
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	376	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	377	saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	378
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	379	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	380	2: 'C'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	381
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	382	$ hg strip 2 1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	383	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	384	saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	385
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	386	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	387	0: 'A'
18983 31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	388
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	389	Make sure rebase does not break for phase/filter related reason
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	390	----------------------------------------------------------------
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	391	(issue3858)
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	392
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	393	$ cd ..
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	394
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	395	$ cat >> $HGRCPATH << EOF
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	396	> [ui]
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	397	> logtemplate={rev} {desc} {phase}\n
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	398	> EOF
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	399
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	400
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	401	$ hg init c4
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	402	$ cd c4
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	403
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	404	$ echo a > a
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	405	$ hg ci -Am A
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	406	adding a
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	407	$ echo b > b
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	408	$ hg ci -Am B
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	409	adding b
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	410	$ hg up 0
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	411	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	412	$ echo c > c
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	413	$ hg ci -Am C
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	414	adding c
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	415	created new head
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	416	$ hg up 1
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	417	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	418	$ hg merge
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	419	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	420	(branch merge, don't forget to commit)
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	421	$ hg ci -m d
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	422	$ hg up 2
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	423	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	424	$ echo e > e
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	425	$ hg ci -Am E
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	426	adding e
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	427	created new head
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	428	$ hg merge 3
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	429	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	430	(branch merge, don't forget to commit)
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	431	$ hg ci -m F
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	432	$ hg up 3
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	433	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	434	$ echo g > g
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	435	$ hg ci -Am G
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	436	adding g
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	437	created new head
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	438	$ echo h > h
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	439	$ hg ci -Am H
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	440	adding h
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	441	$ hg up 5
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	442	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	443	$ echo i > i
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	444	$ hg ci -Am I
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	445	adding i
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	446
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	447	Turn most changeset public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	448
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	449	$ hg ph -p 7
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	450
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	451	$ hg heads
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	452	8 I draft
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	453	7 H public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	454	$ hg log -G
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	455	@ 8 I draft
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	456	\|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	457	\| o 7 H public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	458	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	459	\| o 6 G public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	460	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	461	o \| 5 F draft
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	462	\|\\|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	463	o \| 4 E draft
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	464	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	465	\| o 3 d public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	466	\|/\|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	467	o \| 2 C public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	468	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	469	\| o 1 B public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	470	\|/
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	471	o 0 A public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	472
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	473
22251 d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	474	$ cat > $TESTTMP/checkeditform.sh <<EOF
d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	475	> env \| grep HGEDITFORM
d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	476	> true
d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	477	> EOF
d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	478	$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	479	rebasing 5:361a99976cc9 "F"
22251 d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	480	HGEDITFORM=rebase.merge
45771 f90a5c211251 rebase: change and standarize template for rebase's one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 40865 diff changeset	481	rebasing 8:326cfedc031c tip "I"
22251 d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	482	HGEDITFORM=rebase.normal
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33332 diff changeset	483	saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg

author	pacien <pacien.trangirard@pacien.net>
	Thu, 22 Sep 2022 16:09:53 +0200
changeset 49499	4f36738a869a
parent 45771	f90a5c211251
permissions	-rw-r--r--