mercurial: tests/test-rebase-cache.t@2fb0504b8175 (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
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	34	(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	35	$ hg ci -m 'branch2'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	36
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	37	$ echo c > C
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	38	$ hg ci -Am C
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	39	adding C
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	40
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	41	$ hg up -q 2
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	42
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	43	$ hg branch -f branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	44	marked working directory as branch branch2
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	45	(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	46	$ echo d > d
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	47	$ hg ci -Am D
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	48	adding d
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	49	created new head
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	50
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	51	$ echo e > e
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	52	$ hg ci -Am E
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	53	adding e
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	54
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	55	$ hg update default
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	56	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	57
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	58	$ hg branch branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	59	marked working directory as branch branch3
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	60	(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	61	$ hg ci -m 'branch3'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	62
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	63	$ echo f > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	64	$ hg ci -Am F
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	65	adding f
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	$ cd ..
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
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	70	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	71
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	72	$ hg clone -q -u . a a1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	73	$ cd a1
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	74
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17013 diff changeset	75	$ hg tglog
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	76	@ 8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	77	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	78	o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	79	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	80	\| o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	81	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	82	\| o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	83	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	84	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	85	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	86	+---o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	87	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	88	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	89	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	90	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	91	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	92	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	93
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	94	$ 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	95	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	96	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	97	branch1 2:0a03079c47fd (inactive)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	98	default 0:1994f17a630e (inactive)
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	99
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	100	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	101	8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	102	6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	103	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	104	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	105	0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	106
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	107	$ 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	108	rebasing 5:635859577d0b "D"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	109	rebasing 6:5097051d331d "E"
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	110	saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob)
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	111
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	112	$ 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	113	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	114	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	115	branch1 2:0a03079c47fd
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	116	default 0:1994f17a630e (inactive)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	117
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	118	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	119	8: 'E' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	120	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	121	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	122	0: 'A'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	123
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17013 diff changeset	124	$ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19324 diff changeset	125	o 8: 'E' branch3
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	126	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	127	o 7: 'D' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	128	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19324 diff changeset	129	@ 6: 'F' branch3
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	130	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	131	o 5: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	132	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	133	\| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	134	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	135	\| o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	136	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	137	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	138	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	139	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	140	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	141	o 0: 'A'
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	$ cd ..
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
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	146	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	147
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	148	$ hg clone -q -u . a a2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	149	$ cd a2
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	150
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	151	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	152	@ 8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	153	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	154	o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	155	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	156	\| o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	157	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	158	\| o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	159	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	160	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	161	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	162	+---o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	163	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	164	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	165	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	166	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	167	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	168	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	169
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	170	$ hg rebase -s 8 -d 6
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	171	rebasing 8:4666b71e8e32 "F" (tip)
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	172	saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob)
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	173
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	174	$ 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	175	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	176	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	177	branch1 2:0a03079c47fd (inactive)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	178	default 0:1994f17a630e (inactive)
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	179
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	180	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	181	8: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	182	7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	183	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	184	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	185	0: 'A'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	186
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	187	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	188	@ 8: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	189	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	190	\| o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	191	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	192	o \| 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	193	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	194	o \| 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	195	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	196	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	197	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	198	\| \| o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	199	\| \|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	200	o \| 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	201	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	202	o \| 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	203	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	204	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	205
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	206	$ hg verify -q
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	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	209
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	210
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	211	Rebase entire branch3 (7-8) onto branch2 (6):
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	212
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	213	$ hg clone -q -u . a a3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	214	$ cd a3
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	215
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	216	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	217	@ 8: 'F' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	218	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	219	o 7: 'branch3' branch3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	220	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	221	\| o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	222	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	223	\| o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	224	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	225	\| \| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	226	\| \| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	227	+---o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	228	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	229	\| o 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	230	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	231	\| o 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	232	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	233	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	234
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	235	$ 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	236	rebasing 7:653b9feb4616 "branch3"
23518 2fb0504b8175 rebase: show warning when rebase creates no changes to commit Mads Kiilerich <madski@unity3d.com> parents: 23517 diff changeset	237	note: rebase of 7:653b9feb4616 created no changes to commit
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	238	rebasing 8:4666b71e8e32 "F" (tip)
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	239	saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob)
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	240
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	241	$ 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	242	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	243	branch1 2:0a03079c47fd (inactive)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	244	default 0:1994f17a630e (inactive)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	245
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	246	$ hg theads
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	247	7: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	248	4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	249	2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	250	0: 'A'
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	251
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17013 diff changeset	252	$ hg tglog
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	253	@ 7: 'F' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	254	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	255	o 6: 'E' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	256	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	257	o 5: 'D' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	258	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	259	\| o 4: 'C' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	260	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	261	\| o 3: 'branch2' branch2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	262	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	263	o \| 2: 'B' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	264	\| \|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	265	o \| 1: 'branch1' branch1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	266	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	267	o 0: 'A'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	268
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	269	$ hg verify -q
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	270
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	271	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	272	update the branch cache.
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	273
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	274	$ hg strip 2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	275	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	276	saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-backup.hg (glob)
17013 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	$ hg tglog
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	279	o 3: 'C' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	280	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	281	o 2: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	282	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	283	\| @ 1: 'branch1' branch1
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	o 0: 'A'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	286
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	287
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	288	$ hg branches
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	289	branch2 3:e4fdb121d036
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	290	branch1 1:63379ac49655
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	291	default 0:1994f17a630e (inactive)
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	292
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	293	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	294	3: 'C' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	295	1: 'branch1' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	296	0: 'A'
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	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	299	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	300
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	301	$ hg init b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	302	$ cd b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	303
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	304	$ hg branch branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	305	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	306	(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	307	$ hg ci -m 'branch1'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	308
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	309	$ hg branch branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	310	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	311	(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	312	$ hg ci -m 'branch2'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	313
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	314	$ hg branch -f branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	315	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	316	(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	317
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	318	$ echo a > A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	319	$ hg ci -Am A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	320	adding A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	321	created new head
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	$ hg tglog
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	324	@ 2: 'A' branch1
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	o 1: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	327	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	328	o 0: 'branch1' branch1
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
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	331	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	332	2: 'A' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	333	1: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	334
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	335	$ hg strip 2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	336	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	337	saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-backup.hg (glob)
17013 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	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	340	1: 'branch2' branch2
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	341	0: 'branch1' branch1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	342
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	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	345	Try both orders.
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	346
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 15742 diff changeset	347	$ cd ..
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	348
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	349	$ hg init c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	350	$ cd c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	351
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	352	$ echo a > a
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	353	$ hg ci -Am A
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	354	adding a
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	355	$ echo b > b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	356	$ hg ci -Am B
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	357	adding b
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	358	$ echo c > c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	359	$ hg ci -Am C
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	360	adding c
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	361	$ echo d > d
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	362	$ hg ci -Am D
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	363	adding d
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	364	$ echo e > e
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	365	$ hg ci -Am E
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	366	adding e
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	$ hg tglog
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	369	@ 4: 'E'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	370	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	371	o 3: 'D'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	372	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	373	o 2: 'C'
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	o 1: 'B'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	376	\|
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	377	o 0: 'A'
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
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	380	$ hg strip 3 4
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	381	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	382	saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-backup.hg (glob)
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	383
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	384	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	385	2: 'C'
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	386
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	387	$ hg strip 2 1
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	388	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	389	saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
17013 c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	390
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	391	$ hg theads
c8eda7bbdcab strip: incrementally update the branchheads cache after a strip Joshua Redstone <joshua.redstone@fb.com> parents: 17005 diff changeset	392	0: 'A'
18983 31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	393
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	394	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	395	----------------------------------------------------------------
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	396	(issue3858)
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	397
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	398	$ cd ..
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	$ cat >> $HGRCPATH << EOF
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	401	> [ui]
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	402	> 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	403	> EOF
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	404
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	405
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	406	$ hg init c4
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	407	$ cd c4
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	408
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	409	$ echo a > a
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	410	$ 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	411	adding a
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	412	$ echo b > b
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 B
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	414	adding b
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	415	$ hg up 0
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	416	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	417	$ echo c > c
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	418	$ 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	419	adding c
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	420	created new head
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	421	$ hg up 1
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	422	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	423	$ hg merge
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	424	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	425	(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	426	$ 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	427	$ hg up 2
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	428	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	429	$ echo e > e
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	430	$ 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	431	adding e
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	432	created new head
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	433	$ hg merge 3
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	434	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	435	(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	436	$ 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	437	$ hg up 3
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	438	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	439	$ echo g > g
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	440	$ 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	441	adding g
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	442	created new head
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	443	$ echo h > h
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 H
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	445	adding h
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	446	$ hg up 5
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	447	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	448	$ echo i > i
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	449	$ 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	450	adding i
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	451
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	452	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	453
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	454	$ 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	455
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	456	$ hg heads
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	457	8 I draft
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	458	7 H public
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	459	$ hg log -G
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	460	@ 8 I draft
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	461	\|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	462	\| 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	463	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	464	\| 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	465	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	466	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	467	\|\\|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	468	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	469	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	470	\| 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	471	\|/\|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	472	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	473	\| \|
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	474	\| 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	475	\|/
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	476	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	477
31bcc5112191 destroyed: invalidate phraserevs cache in all case (issue3858) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17345 diff changeset	478
22251 d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	479	$ 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	480	> env \| grep HGEDITFORM
d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	481	> true
d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	482	> EOF
d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	483	$ 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	484	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	485	HGEDITFORM=rebase.merge
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23516 diff changeset	486	rebasing 8:326cfedc031c "I" (tip)
22251 d0d3e5c6eb3c rebase: change "editform" to distinguish merge commits from others FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	487	HGEDITFORM=rebase.normal
23516 328afbad6e57 tests: make 'saved backup' globbing less narrow in rebase tests Mads Kiilerich <madski@unity3d.com> parents: 22251 diff changeset	488	saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob)

author	Mads Kiilerich <madski@unity3d.com>
	Wed, 10 Dec 2014 06:20:35 +0100
changeset 23518	2fb0504b8175
parent 23517	4f18e80d9c30
child 23835	aa4a1672583e
permissions	-rw-r--r--