mercurial: tests/test-rebase-obsolete.t@b212e01fead0 (annotated)

17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1	==========================
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2	Test rebase with obsolete
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	3	==========================
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	4
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	5	Enable obsolete
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	6
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	7	$ cat >> $HGRCPATH << EOF
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	8	> [ui]
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	9	> logtemplate= {rev}:{node\|short} {desc\|firstline}
22955 fab9dda0f2a3 obsolete: update tests to use obsolete options Durham Goode <durham@fb.com> parents: 22260 diff changeset	10	> [experimental]
fab9dda0f2a3 obsolete: update tests to use obsolete options Durham Goode <durham@fb.com> parents: 22260 diff changeset	11	> evolution=createmarkers,allowunstable
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	12	> [phases]
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	13	> publish=False
27011 53c668dc6b16 rebase: fix a typo in test-rebase-obsolete Laurent Charignon <lcharignon@fb.com> parents: 26902 diff changeset	14	> [extensions]
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	15	> rebase=
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	16	> EOF
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	17
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	18	Setup rebase canonical repo
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	19
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	20	$ hg init base
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	21	$ cd base
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	22	$ hg unbundle "$TESTDIR/bundles/rebase.hg"
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	23	adding changesets
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	24	adding manifests
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	25	adding file changes
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	26	added 8 changesets with 7 changes to 7 files (+2 heads)
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	27	(run 'hg heads' to see heads, 'hg merge' to merge)
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	28	$ hg up tip
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	29	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	30	$ hg log -G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	31	@ 7:02de42196ebe H
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	32	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	33	\| o 6:eea13746799a G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	34	\|/\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	35	o \| 5:24b6387c8c8c F
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	36	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	37	\| o 4:9520eea781bc E
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	38	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	39	\| o 3:32af7686d403 D
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	40	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	41	\| o 2:5fddd98957c8 C
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	42	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	43	\| o 1:42ccdea3bb16 B
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	44	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	45	o 0:cd010b8cd998 A
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	46
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	47	$ cd ..
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	48
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	49	simple rebase
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	50	---------------------------------
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	51
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	52	$ hg clone base simple
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	53	updating to branch default
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	54	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	55	$ cd simple
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	56	$ hg up 32af7686d403
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	57	3 files updated, 0 files merged, 2 files removed, 0 files unresolved
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	58	$ hg rebase -d eea13746799a
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	59	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	60	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	61	rebasing 3:32af7686d403 "D"
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	62	$ hg log -G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	63	@ 10:8eeb3c33ad33 D
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	64	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	65	o 9:2327fea05063 C
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	66	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	67	o 8:e4e5be0395b2 B
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	68	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	69	\| o 7:02de42196ebe H
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	70	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	71	o \| 6:eea13746799a G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	72	\|\\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	73	\| o 5:24b6387c8c8c F
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	74	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	75	o \| 4:9520eea781bc E
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	76	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	77	o 0:cd010b8cd998 A
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	78
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	79	$ hg log --hidden -G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	80	@ 10:8eeb3c33ad33 D
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	81	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	82	o 9:2327fea05063 C
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	83	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	84	o 8:e4e5be0395b2 B
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	85	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	86	\| o 7:02de42196ebe H
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	87	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	88	o \| 6:eea13746799a G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	89	\|\\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	90	\| o 5:24b6387c8c8c F
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	91	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	92	o \| 4:9520eea781bc E
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	93	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	94	\| x 3:32af7686d403 D
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	95	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	96	\| x 2:5fddd98957c8 C
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	97	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	98	\| x 1:42ccdea3bb16 B
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	99	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	100	o 0:cd010b8cd998 A
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	101
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	102	$ hg debugobsolete
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	103	42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	104	5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 2327fea05063f39961b14cb69435a9898dc9a245 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	105	32af7686d403cf45b5d95f2d70cebea587ac806a 8eeb3c33ad33d452c89e5dcf611c347f978fb42b 0 (*) {'user': 'test'} (glob)
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	106
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	107
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	108	$ cd ..
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	109
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	110	empty changeset
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	111	---------------------------------
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	112
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	113	$ hg clone base empty
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	114	updating to branch default
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	115	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	116	$ cd empty
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	117	$ hg up eea13746799a
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	118	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	119
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	120	We make a copy of both the first changeset in the rebased and some other in the
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	121	set.
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	122
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	123	$ hg graft 42ccdea3bb16 32af7686d403
23505 bd5dbb8a05c8 graft: show more useful status information while grafting Mads Kiilerich <madski@unity3d.com> parents: 22955 diff changeset	124	grafting 1:42ccdea3bb16 "B"
bd5dbb8a05c8 graft: show more useful status information while grafting Mads Kiilerich <madski@unity3d.com> parents: 22955 diff changeset	125	grafting 3:32af7686d403 "D"
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	126	$ hg rebase -s 42ccdea3bb16 -d .
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	127	rebasing 1:42ccdea3bb16 "B"
23518 2fb0504b8175 rebase: show warning when rebase creates no changes to commit Mads Kiilerich <madski@unity3d.com> parents: 23517 diff changeset	128	note: rebase of 1:42ccdea3bb16 created no changes to commit
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	129	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	130	rebasing 3:32af7686d403 "D"
23518 2fb0504b8175 rebase: show warning when rebase creates no changes to commit Mads Kiilerich <madski@unity3d.com> parents: 23517 diff changeset	131	note: rebase of 3:32af7686d403 created no changes to commit
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	132	$ hg log -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	133	o 10:5ae4c968c6ac C
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	134	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	135	@ 9:08483444fef9 D
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	136	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	137	o 8:8877864f1edb B
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	138	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	139	\| o 7:02de42196ebe H
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	140	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	141	o \| 6:eea13746799a G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	142	\|\\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	143	\| o 5:24b6387c8c8c F
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	144	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	145	o \| 4:9520eea781bc E
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	146	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	147	o 0:cd010b8cd998 A
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	148
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	149	$ hg log --hidden -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	150	o 10:5ae4c968c6ac C
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	151	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	152	@ 9:08483444fef9 D
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	153	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	154	o 8:8877864f1edb B
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	155	\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	156	\| o 7:02de42196ebe H
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	157	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	158	o \| 6:eea13746799a G
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	159	\|\\|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	160	\| o 5:24b6387c8c8c F
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	161	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	162	o \| 4:9520eea781bc E
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	163	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	164	\| x 3:32af7686d403 D
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	165	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	166	\| x 2:5fddd98957c8 C
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	167	\| \|
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	168	\| x 1:42ccdea3bb16 B
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	169	\|/
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	170	o 0:cd010b8cd998 A
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	171
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	172	$ hg debugobsolete
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22220 diff changeset	173	42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	174	5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob)
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22220 diff changeset	175	32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	176
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	177
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	178	More complex case were part of the rebase set were already rebased
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	179
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	180	$ hg rebase --rev 'desc(D)' --dest 'desc(H)'
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	181	rebasing 9:08483444fef9 "D"
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	182	$ hg debugobsolete
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22220 diff changeset	183	42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	184	5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob)
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22220 diff changeset	185	32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	186	08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob)
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	187	$ hg log -G
19861 a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	188	@ 11:4596109a6a43 D
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	189	\|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	190	\| o 10:5ae4c968c6ac C
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	191	\| \|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	192	\| x 9:08483444fef9 D
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	193	\| \|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	194	\| o 8:8877864f1edb B
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	195	\| \|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	196	o \| 7:02de42196ebe H
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	197	\| \|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	198	\| o 6:eea13746799a G
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	199	\|/\|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	200	o \| 5:24b6387c8c8c F
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	201	\| \|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	202	\| o 4:9520eea781bc E
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	203	\|/
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	204	o 0:cd010b8cd998 A
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	205
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	206	$ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	207	rebasing 8:8877864f1edb "B"
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	208	note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D"
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	209	rebasing 10:5ae4c968c6ac "C"
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	210	$ hg debugobsolete
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22220 diff changeset	211	42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	212	5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob)
22260 2229d757802d debugobsolete: display parents information from markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22220 diff changeset	213	32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	214	08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	215	8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	216	5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob)
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	217	$ hg log --rev 'divergent()'
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	218	$ hg log -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	219	o 13:98f6af4ee953 C
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	220	\|
19861 a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	221	o 12:462a34d07e59 B
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	222	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	223	@ 11:4596109a6a43 D
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	224	\|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	225	o 7:02de42196ebe H
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	226	\|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	227	\| o 6:eea13746799a G
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	228	\|/\|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	229	o \| 5:24b6387c8c8c F
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	230	\| \|
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	231	\| o 4:9520eea781bc E
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	232	\|/
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	233	o 0:cd010b8cd998 A
55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	234
19861 a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	235	$ hg log --style default --debug -r 4596109a6a4328c398bde3a4a3b6737cfade3003
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	236	changeset: 11:4596109a6a4328c398bde3a4a3b6737cfade3003
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	237	phase: draft
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	238	parent: 7:02de42196ebee42ef284b6780a87cdc96e8eaab6
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	239	parent: -1:0000000000000000000000000000000000000000
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	240	manifest: 11:a91006e3a02f1edf631f7018e6e5684cf27dd905
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	241	user: Nicolas Dumazet <nicdumz.commits@gmail.com>
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	242	date: Sat Apr 30 15:24:48 2011 +0200
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	243	files+: D
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	244	extra: branch=default
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	245	extra: rebase_source=08483444fef91d6224f6655ee586a65d263ad34c
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	246	extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	247	description:
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	248	D
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	249
a69a77a80900 rebase: preserve metadata from grafts of changes (issue4001) Augie Fackler <raf@durin42.com> parents: 18472 diff changeset	250
26902 7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	251	$ hg up -qr 'desc(G)'
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	252	$ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	253	grafting 11:4596109a6a43 "D"
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	254	$ hg up -qr 'desc(E)'
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	255	$ hg rebase -s tip -d .
27974 bb14a81ce647 graft: don't preserve most extra fields Siddharth Agarwal <sid0@fb.com> parents: 27746 diff changeset	256	rebasing 14:9e36056a46e3 "D" (tip)
26902 7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	257	$ hg log --style default --debug -r tip
27974 bb14a81ce647 graft: don't preserve most extra fields Siddharth Agarwal <sid0@fb.com> parents: 27746 diff changeset	258	changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab
26902 7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	259	tag: tip
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	260	phase: draft
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	261	parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	262	parent: -1:0000000000000000000000000000000000000000
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	263	manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	264	user: Nicolas Dumazet <nicdumz.commits@gmail.com>
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	265	date: Sat Apr 30 15:24:48 2011 +0200
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	266	files+: D
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	267	extra: branch=default
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	268	extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003
27974 bb14a81ce647 graft: don't preserve most extra fields Siddharth Agarwal <sid0@fb.com> parents: 27746 diff changeset	269	extra: rebase_source=9e36056a46e37c9776168c7375734eebc70e294f
26902 7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	270	extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	271	description:
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	272	D
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	273
7ffebbdcb371 rebase: preserve the 'intermediate-source' attribute of grafts Matt Harbison <matt_harbison@yahoo.com> parents: 26811 diff changeset	274
17612 fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	275	$ cd ..
fc2a6114f0a0 rebase: allow creation obsolescence relation instead of stripping Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	276
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	277	collapse rebase
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	278	---------------------------------
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	279
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	280	$ hg clone base collapse
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	281	updating to branch default
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	282	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	283	$ cd collapse
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	284	$ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	285	rebasing 1:42ccdea3bb16 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	286	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	287	rebasing 3:32af7686d403 "D"
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	288	$ hg log -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	289	o 8:4dc2197e807b Collapsed revision
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	290	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	291	\| @ 7:02de42196ebe H
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	292	\| \|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	293	o \| 6:eea13746799a G
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	294	\|\\|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	295	\| o 5:24b6387c8c8c F
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	296	\| \|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	297	o \| 4:9520eea781bc E
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	298	\|/
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	299	o 0:cd010b8cd998 A
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	300
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	301	$ hg log --hidden -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	302	o 8:4dc2197e807b Collapsed revision
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	303	\|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	304	\| @ 7:02de42196ebe H
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	305	\| \|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	306	o \| 6:eea13746799a G
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	307	\|\\|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	308	\| o 5:24b6387c8c8c F
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	309	\| \|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	310	o \| 4:9520eea781bc E
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	311	\|/
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	312	\| x 3:32af7686d403 D
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	313	\| \|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	314	\| x 2:5fddd98957c8 C
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	315	\| \|
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	316	\| x 1:42ccdea3bb16 B
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	317	\|/
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	318	o 0:cd010b8cd998 A
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	319
19924 c23c62209cc4 tests: prepare rebase test for wc parent preservation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19861 diff changeset	320	$ hg id --debug -r tip
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	321	4dc2197e807bae9817f09905b50ab288be2dbbcf tip
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	322	$ hg debugobsolete
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	323	42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	324	5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	325	32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob)
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	326
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	327	$ cd ..
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	328
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	329	Rebase set has hidden descendants
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	330	---------------------------------
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	331
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	332	We rebase a changeset which has a hidden changeset. The hidden changeset must
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	333	not be rebased.
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	334
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	335	$ hg clone base hidden
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	336	updating to branch default
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	337	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	338	$ cd hidden
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	339	$ hg rebase -s 5fddd98957c8 -d eea13746799a
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	340	rebasing 2:5fddd98957c8 "C"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	341	rebasing 3:32af7686d403 "D"
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	342	$ hg rebase -s 42ccdea3bb16 -d 02de42196ebe
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	343	rebasing 1:42ccdea3bb16 "B"
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	344	$ hg log -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	345	o 10:7c6027df6a99 B
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	346	\|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	347	\| o 9:cf44d2f5a9f4 D
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	348	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	349	\| o 8:e273c5e7d2d2 C
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	350	\| \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	351	@ \| 7:02de42196ebe H
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	352	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	353	\| o 6:eea13746799a G
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	354	\|/\|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	355	o \| 5:24b6387c8c8c F
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	356	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	357	\| o 4:9520eea781bc E
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	358	\|/
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	359	o 0:cd010b8cd998 A
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	360
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	361	$ hg log --hidden -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	362	o 10:7c6027df6a99 B
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	363	\|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	364	\| o 9:cf44d2f5a9f4 D
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	365	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	366	\| o 8:e273c5e7d2d2 C
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	367	\| \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	368	@ \| 7:02de42196ebe H
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	369	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	370	\| o 6:eea13746799a G
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	371	\|/\|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	372	o \| 5:24b6387c8c8c F
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	373	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	374	\| o 4:9520eea781bc E
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	375	\|/
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	376	\| x 3:32af7686d403 D
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	377	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	378	\| x 2:5fddd98957c8 C
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	379	\| \|
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	380	\| x 1:42ccdea3bb16 B
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	381	\|/
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	382	o 0:cd010b8cd998 A
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	383
9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	384	$ hg debugobsolete
22220 908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	385	5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	386	32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (*) {'user': 'test'} (glob)
908c76e84ec5 debugobsolete: explicitly display date in the output Pierre-Yves David <pierre-yves.david@fb.com> parents: 19925 diff changeset	387	42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (*) {'user': 'test'} (glob)
17615 9e2dc0d292cd rebase: ensure rebase does not revive extinct revision Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17613 diff changeset	388
18398 1a00c8451640 test: fix in-test comments related to obsolescence Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18164 diff changeset	389	Test that rewriting leaving instability behind is allowed
1a00c8451640 test: fix in-test comments related to obsolescence Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18164 diff changeset	390	---------------------------------------------------------------------
18164 bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	391
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	392	$ hg log -r 'children(8)'
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	393	9:cf44d2f5a9f4 D (no-eol)
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	394	$ hg rebase -r 8
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	395	rebasing 8:e273c5e7d2d2 "C"
18164 bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	396	$ hg log -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	397	o 11:0d8f238b634c C
18164 bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	398	\|
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	399	o 10:7c6027df6a99 B
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	400	\|
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	401	\| o 9:cf44d2f5a9f4 D
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	402	\| \|
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	403	\| x 8:e273c5e7d2d2 C
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	404	\| \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	405	@ \| 7:02de42196ebe H
18164 bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	406	\| \|
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	407	\| o 6:eea13746799a G
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	408	\|/\|
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	409	o \| 5:24b6387c8c8c F
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	410	\| \|
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	411	\| o 4:9520eea781bc E
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	412	\|/
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	413	o 0:cd010b8cd998 A
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	414
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	415
bacf55bd8f90 rebase: allow non-head rebase-set when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17615 diff changeset	416
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	417	Test multiple root handling
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	418	------------------------------------
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	419
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	420	$ hg rebase --dest 4 --rev '7+11+9'
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	421	rebasing 7:02de42196ebe "H"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	422	rebasing 9:cf44d2f5a9f4 "D"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	423	not rebasing ignored 10:7c6027df6a99 "B"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	424	rebasing 11:0d8f238b634c "C" (tip)
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	425	$ hg log -G
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	426	o 14:1e8370e38cca C
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	427	\|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	428	\| o 13:102b4c1d889b D
18447 7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18444 diff changeset	429	\| \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19924 diff changeset	430	@ \| 12:bfe264faf697 H
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	431	\|/
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	432	\| o 10:7c6027df6a99 B
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	433	\| \|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	434	\| x 7:02de42196ebe H
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	435	\| \|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	436	+---o 6:eea13746799a G
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	437	\| \|/
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	438	\| o 5:24b6387c8c8c F
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	439	\| \|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	440	o \| 4:9520eea781bc E
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	441	\|/
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	442	o 0:cd010b8cd998 A
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18398 diff changeset	443
18444 55aff0c2b73c rebase: do not invent successor to skipped changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18424 diff changeset	444	$ cd ..
18472 37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	445
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	446	test on rebase dropping a merge
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	447
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	448	(setup)
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	449
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	450	$ hg init dropmerge
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	451	$ cd dropmerge
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	452	$ hg unbundle "$TESTDIR/bundles/rebase.hg"
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	453	adding changesets
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	454	adding manifests
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	455	adding file changes
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	456	added 8 changesets with 7 changes to 7 files (+2 heads)
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	457	(run 'hg heads' to see heads, 'hg merge' to merge)
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	458	$ hg up 3
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	459	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	460	$ hg merge 7
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	461	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	462	(branch merge, don't forget to commit)
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	463	$ hg ci -m 'M'
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	464	$ echo I > I
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	465	$ hg add I
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	466	$ hg ci -m I
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	467	$ hg log -G
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	468	@ 9:4bde274eefcf I
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	469	\|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	470	o 8:53a6a128b2b7 M
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	471	\|\
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	472	\| o 7:02de42196ebe H
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	473	\| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	474	\| \| o 6:eea13746799a G
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	475	\| \|/\|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	476	\| o \| 5:24b6387c8c8c F
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	477	\| \| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	478	\| \| o 4:9520eea781bc E
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	479	\| \|/
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	480	o \| 3:32af7686d403 D
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	481	\| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	482	o \| 2:5fddd98957c8 C
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	483	\| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	484	o \| 1:42ccdea3bb16 B
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	485	\|/
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	486	o 0:cd010b8cd998 A
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	487
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	488	(actual test)
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	489
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	490	$ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
23517 4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	491	rebasing 3:32af7686d403 "D"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	492	rebasing 7:02de42196ebe "H"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	493	not rebasing ignored 8:53a6a128b2b7 "M"
4f18e80d9c30 rebase: show more useful status information while rebasing Mads Kiilerich <madski@unity3d.com> parents: 23505 diff changeset	494	rebasing 9:4bde274eefcf "I" (tip)
18472 37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	495	$ hg log -G
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	496	@ 12:acd174b7ab39 I
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	497	\|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	498	o 11:6c11a6218c97 H
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	499	\|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	500	\| o 10:b5313c85b22e D
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	501	\|/
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	502	\| o 8:53a6a128b2b7 M
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	503	\| \|\
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	504	\| \| x 7:02de42196ebe H
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	505	\| \| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	506	o---+ 6:eea13746799a G
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	507	\| \| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	508	\| \| o 5:24b6387c8c8c F
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	509	\| \| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	510	o---+ 4:9520eea781bc E
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	511	/ /
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	512	x \| 3:32af7686d403 D
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	513	\| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	514	o \| 2:5fddd98957c8 C
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	515	\| \|
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	516	o \| 1:42ccdea3bb16 B
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	517	\|/
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	518	o 0:cd010b8cd998 A
37100f30590f test-rebase: add another test for rebase with multiple roots Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18447 diff changeset	519
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	520
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	521	Test hidden changesets in the rebase set (issue4504)
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	522
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	523	$ hg up --hidden 9
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	524	3 files updated, 0 files merged, 1 files removed, 0 files unresolved
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	525	$ echo J > J
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	526	$ hg add J
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	527	$ hg commit -m J
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	528	$ hg debugobsolete `hg log --rev . -T '{node}'`
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	529
28429 a47881680402 rebase: turn rebaseskipobsolete on by default Kostia Balytskyi <ikostia@fb.com> parents: 28280 diff changeset	530	$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	531	rebasing 9:4bde274eefcf "I"
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	532	rebasing 13:06edfc82198f "J" (tip)
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	533	$ hg log -G
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	534	@ 15:5ae8a643467b J
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	535	\|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	536	o 14:9ad579b4a5de I
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	537	\|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	538	\| o 12:acd174b7ab39 I
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	539	\| \|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	540	\| o 11:6c11a6218c97 H
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	541	\| \|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	542	o \| 10:b5313c85b22e D
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	543	\|/
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	544	\| o 8:53a6a128b2b7 M
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	545	\| \|\
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	546	\| \| x 7:02de42196ebe H
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	547	\| \| \|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	548	o---+ 6:eea13746799a G
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	549	\| \| \|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	550	\| \| o 5:24b6387c8c8c F
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	551	\| \| \|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	552	o---+ 4:9520eea781bc E
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	553	/ /
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	554	x \| 3:32af7686d403 D
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	555	\| \|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	556	o \| 2:5fddd98957c8 C
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	557	\| \|
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	558	o \| 1:42ccdea3bb16 B
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	559	\|/
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	560	o 0:cd010b8cd998 A
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23518 diff changeset	561
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	562	$ hg up 14 -C
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	563	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	564	$ echo "K" > K
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	565	$ hg add K
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	566	$ hg commit --amend -m "K"
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	567	$ echo "L" > L
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	568	$ hg add L
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	569	$ hg commit -m "L"
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	570	$ hg up '.^'
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	571	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	572	$ echo "M" > M
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	573	$ hg add M
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	574	$ hg commit --amend -m "M"
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	575	$ hg log -G
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	576	@ 20:bfaedf8eb73b M
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	577	\|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	578	\| o 18:97219452e4bd L
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	579	\| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	580	\| x 17:fc37a630c901 K
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	581	\|/
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	582	\| o 15:5ae8a643467b J
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	583	\| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	584	\| x 14:9ad579b4a5de I
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	585	\|/
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	586	\| o 12:acd174b7ab39 I
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	587	\| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	588	\| o 11:6c11a6218c97 H
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	589	\| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	590	o \| 10:b5313c85b22e D
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	591	\|/
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	592	\| o 8:53a6a128b2b7 M
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	593	\| \|\
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	594	\| \| x 7:02de42196ebe H
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	595	\| \| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	596	o---+ 6:eea13746799a G
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	597	\| \| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	598	\| \| o 5:24b6387c8c8c F
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	599	\| \| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	600	o---+ 4:9520eea781bc E
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	601	/ /
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	602	x \| 3:32af7686d403 D
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	603	\| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	604	o \| 2:5fddd98957c8 C
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	605	\| \|
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	606	o \| 1:42ccdea3bb16 B
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	607	\|/
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	608	o 0:cd010b8cd998 A
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	609
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	610	$ hg rebase -s 14 -d 18 --config experimental.rebaseskipobsolete=True
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	611	note: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K"
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	612	rebasing 15:5ae8a643467b "J"
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 23970 diff changeset	613
26675 b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	614	$ cd ..
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	615
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	616	Skip obsolete changeset even with multiple hops
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	617	-----------------------------------------------
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	618
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	619	setup
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	620
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	621	$ hg init obsskip
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	622	$ cd obsskip
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	623	$ cat << EOF >> .hg/hgrc
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	624	> [experimental]
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	625	> rebaseskipobsolete = True
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	626	> [extensions]
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	627	> strip =
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	628	> EOF
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	629	$ echo A > A
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	630	$ hg add A
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	631	$ hg commit -m A
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	632	$ echo B > B
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	633	$ hg add B
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	634	$ hg commit -m B0
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	635	$ hg commit --amend -m B1
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	636	$ hg commit --amend -m B2
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	637	$ hg up --hidden 'desc(B0)'
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	638	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	639	$ echo C > C
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	640	$ hg add C
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	641	$ hg commit -m C
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	642
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	643	Rebase finds its way in a chain of marker
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	644
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	645	$ hg rebase -d 'desc(B2)'
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	646	note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	647	rebasing 4:212cb178bcbb "C" (tip)
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	648
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	649	Even when the chain include missing node
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	650
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	651	$ hg up --hidden 'desc(B0)'
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	652	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	653	$ echo D > D
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	654	$ hg add D
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	655	$ hg commit -m D
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	656	$ hg --hidden strip -r 'desc(B1)'
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	657	saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob)
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	658
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	659	$ hg rebase -d 'desc(B2)'
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	660	note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2"
b73eb98c0243 rebase: properly handle chains of markers with missing nodes Pierre-Yves David <pierre-yves.david@fb.com> parents: 26349 diff changeset	661	rebasing 5:1a79b7535141 "D" (tip)
27012 5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	662	$ hg up 4
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	663	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	664	$ echo "O" > O
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	665	$ hg add O
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	666	$ hg commit -m O
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	667	$ echo "P" > P
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	668	$ hg add P
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	669	$ hg commit -m P
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	670	$ hg log -G
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	671	@ 8:8d47583e023f P
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	672	\|
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	673	o 7:360bbaa7d3ce O
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	674	\|
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	675	\| o 6:9c48361117de D
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	676	\| \|
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	677	o \| 4:ff2c4d47b71d C
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	678	\|/
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	679	o 2:261e70097290 B2
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	680	\|
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	681	o 0:4a2df7238c3b A
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	682
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	683	$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	684	$ hg rebase -d 6 -r "4::"
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	685	rebasing 4:ff2c4d47b71d "C"
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	686	note: not rebasing 7:360bbaa7d3ce "O", it has no successor
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27011 diff changeset	687	rebasing 8:8d47583e023f "P" (tip)
27577 f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	688
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	689	If all the changeset to be rebased are obsolete and present in the destination, we
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	690	should display a friendly error message
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	691
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	692	$ hg log -G
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	693	@ 10:121d9e3bc4c6 P
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	694	\|
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	695	o 9:4be60e099a77 C
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	696	\|
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	697	o 6:9c48361117de D
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	698	\|
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	699	o 2:261e70097290 B2
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	700	\|
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	701	o 0:4a2df7238c3b A
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	702
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	703
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	704	$ hg up 9
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	705	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	706	$ echo "non-relevant change" > nonrelevant
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	707	$ hg add nonrelevant
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	708	$ hg commit -m nonrelevant
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	709	created new head
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	710	$ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	711	$ hg rebase -r . -d 10
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	712	abort: all requested changesets have equivalents or were marked as obsolete
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	713	(to force the rebase, set the config experimental.rebaseskipobsolete to False)
f9e755736b0e rebase: better error message when rebased changes are all in destination Laurent Charignon <lcharignon@fb.com> parents: 27147 diff changeset	714	[255]
27746 f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	715
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	716	If a rebase is going to create divergence, it should abort
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	717
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	718	$ hg log -G
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	719	@ 11:f44da1f4954c nonrelevant
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	720	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	721	\| o 10:121d9e3bc4c6 P
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	722	\|/
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	723	o 9:4be60e099a77 C
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	724	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	725	o 6:9c48361117de D
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	726	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	727	o 2:261e70097290 B2
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	728	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	729	o 0:4a2df7238c3b A
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	730
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	731
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	732	$ hg up 9
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	733	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	734	$ echo "john" > doe
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	735	$ hg add doe
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	736	$ hg commit -m "john doe"
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	737	created new head
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	738	$ hg up 10
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	739	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	740	$ echo "foo" > bar
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	741	$ hg add bar
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	742	$ hg commit --amend -m "10'"
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	743	$ hg up 10 --hidden
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	744	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	745	$ echo "bar" > foo
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	746	$ hg add foo
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	747	$ hg commit -m "bar foo"
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	748	$ hg log -G
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	749	@ 15:73568ab6879d bar foo
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	750	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	751	\| o 14:77d874d096a2 10'
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	752	\| \|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	753	\| \| o 12:3eb461388009 john doe
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	754	\| \|/
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	755	x \| 10:121d9e3bc4c6 P
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	756	\|/
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	757	o 9:4be60e099a77 C
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	758	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	759	o 6:9c48361117de D
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	760	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	761	o 2:261e70097290 B2
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	762	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	763	o 0:4a2df7238c3b A
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	764
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	765	$ hg summary
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	766	parent: 15:73568ab6879d tip
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	767	bar foo
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	768	branch: default
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	769	commit: (clean)
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	770	update: 2 new changesets, 3 branch heads (merge)
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	771	phases: 8 draft
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	772	unstable: 1 changesets
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	773	$ hg rebase -s 10 -d 12
28188 6411140aeda9 rebase: add potential divergent commit hashes to error message (issue5086) Kostia Balytskyi <ikostia@fb.com> parents: 27974 diff changeset	774	abort: this rebase will cause divergences from: 121d9e3bc4c6
28280 dc6032a1d888 rebase: remove experimental option from 'rebase' config section Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	775	(to force the rebase please set experimental.allowdivergence=True)
27746 f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	776	[255]
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	777	$ hg log -G
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	778	@ 15:73568ab6879d bar foo
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	779	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	780	\| o 14:77d874d096a2 10'
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	781	\| \|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	782	\| \| o 12:3eb461388009 john doe
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	783	\| \|/
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	784	x \| 10:121d9e3bc4c6 P
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	785	\|/
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	786	o 9:4be60e099a77 C
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	787	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	788	o 6:9c48361117de D
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	789	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	790	o 2:261e70097290 B2
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	791	\|
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	792	o 0:4a2df7238c3b A
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	793
28280 dc6032a1d888 rebase: remove experimental option from 'rebase' config section Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	794	With experimental.allowdivergence=True, rebase can create divergence
27746 f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	795
28280 dc6032a1d888 rebase: remove experimental option from 'rebase' config section Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	796	$ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True
27746 f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	797	rebasing 10:121d9e3bc4c6 "P"
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	798	rebasing 15:73568ab6879d "bar foo" (tip)
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	799	$ hg summary
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	800	parent: 17:61bd55f69bc4 tip
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	801	bar foo
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	802	branch: default
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	803	commit: (clean)
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	804	update: 1 new changesets, 2 branch heads (merge)
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	805	phases: 8 draft
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	806	divergent: 2 changesets
f0e9f38d250f rebase: prevent creating divergence Laurent Charignon <lcharignon@fb.com> parents: 27577 diff changeset	807
28686 b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	808	rebase --continue + skipped rev because their successors are in destination
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	809	we make a change in trunk and work on conflicting changes to make rebase abort.
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	810
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	811	$ hg log -G -r 17::
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	812	@ 17:61bd55f69bc4 bar foo
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	813	\|
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	814	~
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	815
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	816	Create the two changes in trunk
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	817	$ printf "a" > willconflict
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	818	$ hg add willconflict
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	819	$ hg commit -m "willconflict first version"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	820
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	821	$ printf "dummy" > C
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	822	$ hg commit -m "dummy change successor"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	823
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	824	Create the changes that we will rebase
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	825	$ hg update -C 17 -q
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	826	$ printf "b" > willconflict
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	827	$ hg add willconflict
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	828	$ hg commit -m "willconflict second version"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	829	created new head
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	830	$ printf "dummy" > K
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	831	$ hg add K
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	832	$ hg commit -m "dummy change"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	833	$ printf "dummy" > L
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	834	$ hg add L
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	835	$ hg commit -m "dummy change"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	836	$ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.evolution=all
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	837
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	838	$ hg log -G -r 17::
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	839	@ 22:7bdc8a87673d dummy change
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	840	\|
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	841	x 21:8b31da3c4919 dummy change
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	842	\|
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	843	o 20:b82fb57ea638 willconflict second version
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	844	\|
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	845	\| o 19:601db7a18f51 dummy change successor
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	846	\| \|
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	847	\| o 18:357ddf1602d5 willconflict first version
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	848	\|/
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	849	o 17:61bd55f69bc4 bar foo
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	850	\|
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	851	~
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	852	$ hg rebase -r ".^^ + .^ + ." -d 19
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	853	rebasing 20:b82fb57ea638 "willconflict second version"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	854	merging willconflict
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	855	warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark')
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	856	unresolved conflicts (see hg resolve, then hg rebase --continue)
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	857	[1]
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	858
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	859	$ hg resolve --mark willconflict
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	860	(no more unresolved files)
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	861	continue: hg rebase --continue
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	862	$ hg rebase --continue
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	863	rebasing 20:b82fb57ea638 "willconflict second version"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	864	note: not rebasing 21:8b31da3c4919 "dummy change", already in destination as 19:601db7a18f51 "dummy change successor"
b212e01fead0 rebase: fix crash when rebase aborts while rebasing obsolete revisions Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	865	rebasing 22:7bdc8a87673d "dummy change" (tip)

author	Laurent Charignon <lcharignon@fb.com>
	Tue, 29 Mar 2016 11:50:41 -0700
changeset 28686	b212e01fead0
parent 28429	a47881680402
child 29063	8ede973597fd
permissions	-rw-r--r--