equal
deleted
inserted
replaced
|
1 @ 4: E |
|
2 | |
|
3 | o 3: D |
|
4 | | |
|
5 | o 2: C |
|
6 | | |
|
7 | o 1: B |
|
8 |/ |
|
9 o 0: A |
|
10 |
|
11 % Rebasing D onto E detaching from C |
|
12 saving bundle to |
|
13 adding branch |
|
14 adding changesets |
|
15 adding manifests |
|
16 adding file changes |
|
17 added 2 changesets with 2 changes to 2 files (+1 heads) |
|
18 rebase completed |
|
19 @ 4: D |
|
20 | |
|
21 o 3: E |
|
22 | |
|
23 | o 2: C |
|
24 | | |
|
25 | o 1: B |
|
26 |/ |
|
27 o 0: A |
|
28 |
|
29 Expected A, D, E |
|
30 A |
|
31 D |
|
32 E |
|
33 |
|
34 @ 4: E |
|
35 | |
|
36 | o 3: D |
|
37 | | |
|
38 | o 2: C |
|
39 | | |
|
40 | o 1: B |
|
41 |/ |
|
42 o 0: A |
|
43 |
|
44 % Rebasing C onto E detaching from B |
|
45 saving bundle to |
|
46 adding branch |
|
47 adding changesets |
|
48 adding manifests |
|
49 adding file changes |
|
50 added 3 changesets with 3 changes to 3 files (+1 heads) |
|
51 rebase completed |
|
52 @ 4: D |
|
53 | |
|
54 o 3: C |
|
55 | |
|
56 o 2: E |
|
57 | |
|
58 | o 1: B |
|
59 |/ |
|
60 o 0: A |
|
61 |
|
62 Expected A, C, D, E |
|
63 A |
|
64 C |
|
65 D |
|
66 E |
|
67 |
|
68 @ 4: E |
|
69 | |
|
70 | o 3: D |
|
71 | | |
|
72 | o 2: C |
|
73 | | |
|
74 | o 1: B |
|
75 |/ |
|
76 o 0: A |
|
77 |
|
78 % Rebasing B onto E using detach (same as not using it) |
|
79 saving bundle to |
|
80 adding branch |
|
81 adding changesets |
|
82 adding manifests |
|
83 adding file changes |
|
84 added 4 changesets with 4 changes to 4 files |
|
85 rebase completed |
|
86 @ 4: D |
|
87 | |
|
88 o 3: C |
|
89 | |
|
90 o 2: B |
|
91 | |
|
92 o 1: E |
|
93 | |
|
94 o 0: A |
|
95 |
|
96 Expected A, B, C, D, E |
|
97 A |
|
98 B |
|
99 C |
|
100 D |
|
101 E |
|
102 |
|
103 @ 4: E |
|
104 | |
|
105 | o 3: D |
|
106 | | |
|
107 | o 2: C |
|
108 | | |
|
109 | o 1: B |
|
110 |/ |
|
111 o 0: A |
|
112 |
|
113 % Rebasing C onto E detaching from B and collapsing |
|
114 saving bundle to |
|
115 adding branch |
|
116 adding changesets |
|
117 adding manifests |
|
118 adding file changes |
|
119 added 2 changesets with 3 changes to 3 files (+1 heads) |
|
120 rebase completed |
|
121 @ 3: Collapsed revision |
|
122 | * C |
|
123 | * D |
|
124 o 2: E |
|
125 | |
|
126 | o 1: B |
|
127 |/ |
|
128 o 0: A |
|
129 |
|
130 Expected A, C, D, E |
|
131 A |
|
132 C |
|
133 D |
|
134 E |