Mercurial > hg

comparison tests/test-rebase-scenario-global.out @ 11201:34023f2ca305

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up rebase's handling of strip backups
author Matt Mackall <mpm@selenic.com>
date Thu, 20 May 2010 12:21:35 -0500
parents 4bb4895e1693
children f974fe896921
comparison
equal deleted inserted replaced
11200:12e5149cafca 11201:34023f2ca305
10 |/ 10 |/
11 o 0: A 11 o 0: A
12 12
13 % Rebasing 13 % Rebasing
14 % B onto F - simple rebase 14 % B onto F - simple rebase
15 saved backup bundle to
15 adding branch 16 adding branch
16 adding changesets 17 adding changesets
17 adding manifests 18 adding manifests
18 adding file changes 19 adding file changes
19 added 5 changesets with 4 changes to 4 files (+1 heads) 20 added 5 changesets with 4 changes to 4 files (+1 heads)
29 | o 1: C 30 | o 1: C
30 |/ 31 |/
31 o 0: A 32 o 0: A
32 33
33 % B onto D - intermediate point 34 % B onto D - intermediate point
35 saved backup bundle to
34 adding branch 36 adding branch
35 adding changesets 37 adding changesets
36 adding manifests 38 adding manifests
37 adding file changes 39 adding file changes
38 added 5 changesets with 4 changes to 4 files (+2 heads) 40 added 5 changesets with 4 changes to 4 files (+2 heads)
48 | o 1: C 50 | o 1: C
49 |/ 51 |/
50 o 0: A 52 o 0: A
51 53
52 % C onto F - skip of E 54 % C onto F - skip of E
55 saved backup bundle to
53 adding branch 56 adding branch
54 adding changesets 57 adding changesets
55 adding manifests 58 adding manifests
56 adding file changes 59 adding file changes
57 added 3 changesets with 3 changes to 3 files (+1 heads) 60 added 3 changesets with 3 changes to 3 files (+1 heads)
65 | o 1: B 68 | o 1: B
66 |/ 69 |/
67 o 0: A 70 o 0: A
68 71
69 % D onto C - rebase of a branching point (skip E) 72 % D onto C - rebase of a branching point (skip E)
73 saved backup bundle to
70 adding branch 74 adding branch
71 adding changesets 75 adding changesets
72 adding manifests 76 adding manifests
73 adding file changes 77 adding file changes
74 added 2 changesets with 2 changes to 2 files 78 added 2 changesets with 2 changes to 2 files
82 | o 1: B 86 | o 1: B
83 |/ 87 |/
84 o 0: A 88 o 0: A
85 89
86 % E onto F - merged revision having a parent in ancestors of target 90 % E onto F - merged revision having a parent in ancestors of target
91 saved backup bundle to
87 adding branch 92 adding branch
88 adding changesets 93 adding changesets
89 adding manifests 94 adding manifests
90 adding file changes 95 adding file changes
91 added 2 changesets with 1 changes to 1 files (-1 heads) 96 added 2 changesets with 1 changes to 1 files (-1 heads)
101 | o 1: B 106 | o 1: B
102 |/ 107 |/
103 o 0: A 108 o 0: A
104 109
105 % D onto B - E maintains C as parent 110 % D onto B - E maintains C as parent
111 saved backup bundle to
106 adding branch 112 adding branch
107 adding changesets 113 adding changesets
108 adding manifests 114 adding manifests
109 adding file changes 115 adding file changes
110 added 3 changesets with 2 changes to 2 files 116 added 3 changesets with 2 changes to 2 files