Mercurial > hg
comparison tests/test-rebase-detach.t @ 23516:328afbad6e57
tests: make 'saved backup' globbing less narrow in rebase tests
Globbing the hash made it harder to maintain tests with run-tests -i when it
was so far by the generated test output.
The hashes are stable and we just need to add a (glob).
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 07 Dec 2014 20:04:45 +0100 |
parents | b081decd9062 |
children | 4f18e80d9c30 |
comparison
equal
deleted
inserted
replaced
23515:7856a87bbb02 | 23516:328afbad6e57 |
---|---|
46 |/ | 46 |/ |
47 o 0: 'A' | 47 o 0: 'A' |
48 | 48 |
49 $ hg phase --force --secret 3 | 49 $ hg phase --force --secret 3 |
50 $ hg rebase -s 3 -d 7 | 50 $ hg rebase -s 3 -d 7 |
51 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | 51 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob) |
52 | 52 |
53 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 53 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
54 o 7:secret 'D' | 54 o 7:secret 'D' |
55 | | 55 | |
56 @ 6:draft 'H' | 56 @ 6:draft 'H' |
97 | o 1: 'B' | 97 | o 1: 'B' |
98 |/ | 98 |/ |
99 o 0: 'A' | 99 o 0: 'A' |
100 | 100 |
101 $ hg rebase -s 2 -d 7 | 101 $ hg rebase -s 2 -d 7 |
102 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | 102 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
103 | 103 |
104 $ hg tglog | 104 $ hg tglog |
105 o 7: 'D' | 105 o 7: 'D' |
106 | | 106 | |
107 o 6: 'C' | 107 o 6: 'C' |
149 | o 1: 'B' | 149 | o 1: 'B' |
150 |/ | 150 |/ |
151 o 0: 'A' | 151 o 0: 'A' |
152 | 152 |
153 $ hg rebase -s 1 -d 7 | 153 $ hg rebase -s 1 -d 7 |
154 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | 154 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
155 | 155 |
156 $ hg tglog | 156 $ hg tglog |
157 o 7: 'D' | 157 o 7: 'D' |
158 | | 158 | |
159 o 6: 'C' | 159 o 6: 'C' |
203 | o 1: 'B' | 203 | o 1: 'B' |
204 |/ | 204 |/ |
205 o 0: 'A' | 205 o 0: 'A' |
206 | 206 |
207 $ hg rebase --collapse -s 2 -d 7 | 207 $ hg rebase --collapse -s 2 -d 7 |
208 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | 208 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
209 | 209 |
210 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 210 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
211 o 6:secret 'Collapsed revision | 211 o 6:secret 'Collapsed revision |
212 | * C | 212 | * C |
213 | * D' | 213 | * D' |
262 | o 1: 'B' | 262 | o 1: 'B' |
263 |/ | 263 |/ |
264 o 0: 'A' | 264 o 0: 'A' |
265 | 265 |
266 $ hg rebase -s 1 -d tip | 266 $ hg rebase -s 1 -d tip |
267 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) | 267 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
268 | 268 |
269 $ hg tglog | 269 $ hg tglog |
270 o 8: 'D' | 270 o 8: 'D' |
271 | | 271 | |
272 o 7: 'C' | 272 o 7: 'C' |
323 $ hg ci -m "Merge" | 323 $ hg ci -m "Merge" |
324 $ echo "J" >> F | 324 $ echo "J" >> F |
325 $ hg ci -m "J" | 325 $ hg ci -m "J" |
326 | 326 |
327 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other | 327 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
328 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) | 328 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob) |
329 | 329 |
330 $ hg tglog | 330 $ hg tglog |
331 @ 8: 'Collapsed revision | 331 @ 8: 'Collapsed revision |
332 | * I | 332 | * I |
333 | * Merge | 333 | * Merge |