Mercurial > hg

comparison tests/test-rebase-scenario-global.t @ 16540:4fe8eb4a6e2c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add missing accept of native pathname separator
author Mads Kiilerich <mads@kiilerich.com>
date Sat, 28 Apr 2012 01:55:39 +0200
parents 4f795f5fbb0b
children 50f434510da6
comparison
equal deleted inserted replaced
16539:249542ded278 16540:4fe8eb4a6e2c
284 $ hg rebase -d 5 -b 6 --keep 284 $ hg rebase -d 5 -b 6 --keep
285 285
286 Check rebasing mutable changeset 286 Check rebasing mutable changeset
287 Source phase greater or equal to destination phase: new changeset get the phase of source: 287 Source phase greater or equal to destination phase: new changeset get the phase of source:
288 $ hg rebase -s9 -d0 288 $ hg rebase -s9 -d0
289 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg 289 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
290 $ hg log --template "{phase}\n" -r 9 290 $ hg log --template "{phase}\n" -r 9
291 draft 291 draft
292 $ hg rebase -s9 -d1 292 $ hg rebase -s9 -d1
293 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg 293 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
294 $ hg log --template "{phase}\n" -r 9 294 $ hg log --template "{phase}\n" -r 9
295 draft 295 draft
296 $ hg phase --force --secret 9 296 $ hg phase --force --secret 9
297 $ hg rebase -s9 -d0 297 $ hg rebase -s9 -d0
298 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg 298 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
299 $ hg log --template "{phase}\n" -r 9 299 $ hg log --template "{phase}\n" -r 9
300 secret 300 secret
301 $ hg rebase -s9 -d1 301 $ hg rebase -s9 -d1
302 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg 302 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
303 $ hg log --template "{phase}\n" -r 9 303 $ hg log --template "{phase}\n" -r 9
304 secret 304 secret
305 Source phase lower than destination phase: new changeset get the phase of destination: 305 Source phase lower than destination phase: new changeset get the phase of destination:
306 $ hg rebase -s7 -d9 306 $ hg rebase -s7 -d9
307 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg 307 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg (glob)
308 $ hg log --template "{phase}\n" -r 9 308 $ hg log --template "{phase}\n" -r 9
309 secret 309 secret
310 310
311 $ cd .. 311 $ cd ..
312 312