equal
deleted
inserted
replaced
67 move:[5] addb |
67 move:[5] addb |
68 atop:[7] adda |
68 atop:[7] adda |
69 hg rebase -r 22619daeed78 -d 005fe5914f78 |
69 hg rebase -r 22619daeed78 -d 005fe5914f78 |
70 resolving manifests |
70 resolving manifests |
71 getting b |
71 getting b |
|
72 committing files: |
72 b |
73 b |
|
74 committing manifest |
|
75 committing changelog |
73 working directory is now at bede829dd2d3 |
76 working directory is now at bede829dd2d3 |
74 $ glog |
77 $ glog |
75 @ 8:bede829dd2d3@default(draft) addb |
78 @ 8:bede829dd2d3@default(draft) addb |
76 | |
79 | |
77 o 7:005fe5914f78@default(draft) adda |
80 o 7:005fe5914f78@default(draft) adda |
96 hg rebase -r 7a7552255fb5 -d bede829dd2d3 |
99 hg rebase -r 7a7552255fb5 -d bede829dd2d3 |
97 resolving manifests |
100 resolving manifests |
98 getting b |
101 getting b |
99 resolving manifests |
102 resolving manifests |
100 getting c |
103 getting c |
|
104 committing files: |
101 c |
105 c |
|
106 committing manifest |
|
107 committing changelog |
102 working directory is now at 65095d7d0dd5 |
108 working directory is now at 65095d7d0dd5 |
103 $ hg debugobsolete > successors.new |
109 $ hg debugobsolete > successors.new |
104 $ diff -u successors.old successors.new |
110 $ diff -u successors.old successors.new |
105 --- successors.old* (glob) |
111 --- successors.old* (glob) |
106 +++ successors.new* (glob) |
112 +++ successors.new* (glob) |
157 resolving manifests |
163 resolving manifests |
158 removing c |
164 removing c |
159 getting b |
165 getting b |
160 resolving manifests |
166 resolving manifests |
161 getting c |
167 getting c |
|
168 committing files: |
162 c |
169 c |
|
170 committing manifest |
|
171 committing changelog |
163 working directory is now at e99ecf51c867 |
172 working directory is now at e99ecf51c867 |
164 $ glog |
173 $ glog |
165 @ 12:e99ecf51c867@default(draft) addc |
174 @ 12:e99ecf51c867@default(draft) addc |
166 | |
175 | |
167 o 11:036cf654e942@default(draft) addb |
176 o 11:036cf654e942@default(draft) addb |