86 |
86 |
87 Test stabilizing a descendant predecessors child |
87 Test stabilizing a descendant predecessors child |
88 |
88 |
89 $ hg up 7 |
89 $ hg up 7 |
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
91 $ hg debugsuccessors > successors.old |
91 $ hg debugobsolete > successors.old |
92 $ hg stabilize -v |
92 $ hg stabilize -v |
93 move:[3] addc |
93 move:[3] addc |
94 atop:[8] addb |
94 atop:[8] addb |
95 hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f |
95 hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f |
96 resolving manifests |
96 resolving manifests |
97 getting b |
97 getting b |
98 resolving manifests |
98 resolving manifests |
99 getting c |
99 getting c |
100 c |
100 c |
101 $ hg debugsuccessors > successors.new |
101 $ hg debugobsolete > successors.new |
102 $ diff -u successors.old successors.new |
102 $ diff -u successors.old successors.new |
103 --- successors.old* (glob) |
103 --- successors.old* (glob) |
104 +++ successors.new* (glob) |
104 +++ successors.new* (glob) |
105 @@ -1,5 +1,6 @@ |
105 @@ -3,3 +3,4 @@ |
106 3a4a591493f8 f5ff10856e5a |
106 93418d2c0979643ad446f621195e78720edb05b4 f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob) |
107 3ca0ded0dc50 ab8cbb6d87ff |
107 3a4a591493f80708e46f2bf6d3b4debfad8ff91e f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob) |
108 +7a7552255fb5 5e819fbb0d27 |
108 ab8cbb6d87ff3ab5526735a051cba6b63f3d6775 6bf44048e43f830accbf7d2bd7bc252ad7a3b99c 0 {'date': '* *', 'user': 'test'} (glob) |
109 93418d2c0979 f5ff10856e5a |
109 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 5e819fbb0d278117c0a83b7f6f6486689732cfb2 0 {'date': '* *', 'user': 'test'} (glob) |
110 ab8cbb6d87ff 6bf44048e43f |
|
111 ef23d6ef94d6 ab8cbb6d87ff |
|
112 [1] |
110 [1] |
113 $ glog |
111 $ glog |
114 @ 9:5e819fbb0d27@default(draft) addc |
112 @ 9:5e819fbb0d27@default(draft) addc |
115 | |
113 | |
116 o 8:6bf44048e43f@default(draft) addb |
114 o 8:6bf44048e43f@default(draft) addb |