Mercurial > evolve

comparison tests/test-obsolete-rebase.t @ 441:d702f0d26c6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: remove debugsuccessors This was kinda duplicate of core "debugobsolete"
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 07 Aug 2012 16:02:50 +0200
parents cdcdedc532b7
children aedb6b8ace86
comparison
equal deleted inserted replaced
440:5fa287e5087e 441:d702f0d26c6a
51 | | 51 | |
52 o | 1:540395c44225@default(draft) changea 52 o | 1:540395c44225@default(draft) changea
53 |/ 53 |/
54 o 0:07f494440405@default(draft) adda 54 o 0:07f494440405@default(draft) adda
55 55
56 $ hg debugsuccessors 56 $ hg debugobsolete
57 $ hg --config extensions.hgext.mq= strip tip 57 $ hg --config extensions.hgext.mq= strip tip
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg 59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg
60 $ hg rebase -d 1 -r 3 --detach 60 $ hg rebase -d 1 -r 3 --detach
61 $ glog 61 $ glog
76 | | 76 | |
77 o | 1:540395c44225@default(draft) changea 77 o | 1:540395c44225@default(draft) changea
78 |/ 78 |/
79 o 0:07f494440405@default(draft) adda 79 o 0:07f494440405@default(draft) adda
80 80
81 $ hg debugsuccessors 81 $ hg debugobsolete
82 98e4a024635e 9c5494949763 82 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob)
83 83
84 Test rebase with deleted empty revision 84 Test rebase with deleted empty revision
85 85
86 $ hg up 0 86 $ hg up 0
87 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 87 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
102 | | 102 | |
103 | @ 1:540395c44225@default(draft) changea 103 | @ 1:540395c44225@default(draft) changea
104 |/ 104 |/
105 o 0:07f494440405@default(draft) adda 105 o 0:07f494440405@default(draft) adda
106 106
107 $ hg debugsuccessors 107 $ hg debugobsolete
108 4e322f7ce8e3 000000000000 108 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob)
109 98e4a024635e 9c5494949763 109 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 0000000000000000000000000000000000000000 0 {'date': '* *', 'user': 'test'} (glob)
110 110
111 Test rebase --collapse 111 Test rebase --collapse
112 112
113 $ hg up 0 113 $ hg up 0
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
137 | |/ 137 | |/
138 o | 1:540395c44225@default(draft) changea 138 o | 1:540395c44225@default(draft) changea
139 |/ 139 |/
140 o 0:07f494440405@default(draft) adda 140 o 0:07f494440405@default(draft) adda
141 141
142 $ hg debugsuccessors 142 $ hg debugobsolete
143 03f31481307a a7773ffa7edc 143 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob)
144 076e9b2ffbe1 a7773ffa7edc 144 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 0000000000000000000000000000000000000000 0 {'date': '* *', 'user': 'test'} (glob)
145 4e322f7ce8e3 000000000000 145 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
146 98e4a024635e 9c5494949763 146 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
147 147
148 Test rebase --abort 148 Test rebase --abort
149 149
150 $ hg debugsuccessors > ../successors.old 150 $ hg debugobsolete > ../successors.old
151 $ hg up 0 151 $ hg up 0
152 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 152 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
153 $ echo d > d 153 $ echo d > d
154 $ hg ci -Am addd d 154 $ hg ci -Am addd d
155 created new head 155 created new head
162 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) 162 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
163 [255] 163 [255]
164 $ hg rebase --abort 164 $ hg rebase --abort
165 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg 165 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg
166 rebase aborted 166 rebase aborted
167 $ hg debugsuccessors > ../successors.new 167 $ hg debugobsolete > ../successors.new
168 $ diff -u ../successors.old ../successors.new 168 $ diff -u ../successors.old ../successors.new
169 169
170 Test rebase --continue 170 Test rebase --continue
171 171
172 $ hg rebase -d 1 172 $ hg rebase -d 1
202 | |/ 202 | |/
203 o | 1:540395c44225@default(draft) changea 203 o | 1:540395c44225@default(draft) changea
204 |/ 204 |/
205 o 0:07f494440405@default(draft) adda 205 o 0:07f494440405@default(draft) adda
206 206
207 $ hg debugsuccessors > ../successors.new 207 $ hg debugobsolete > ../successors.new
208 $ diff -u ../successors.old ../successors.new 208 $ diff -u ../successors.old ../successors.new
209 --- ../successors.old* (glob) 209 --- ../successors.old* (glob)
210 +++ ../successors.new* (glob) 210 +++ ../successors.new* (glob)
211 @@ -1,4 +1,6 @@ 211 @@ -2,3 +2,5 @@
212 03f31481307a a7773ffa7edc 212 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 0000000000000000000000000000000000000000 0 {'date': '* *', 'user': 'test'} (glob)
213 076e9b2ffbe1 a7773ffa7edc 213 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
214 +4b9d80f48523 1951ead97108 214 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
215 4e322f7ce8e3 000000000000 215 +4b9d80f48523e296f4402cc8e37236b768dfb981 1951ead9710803dbf117e95901954d5ed717f80b 0 {'date': '* *', 'user': 'test'} (glob)
216 98e4a024635e 9c5494949763 216 +a31943eabc4327df16f9eca71bf7779c32f815f7 03f165c84ea8889fc35a64a392caa7a0084dd212 0 {'date': '* *', 'user': 'test'} (glob)
217 +a31943eabc43 03f165c84ea8
218 [1] 217 [1]