tests/test-rebase-newancestor.t
author Kevin Gessner <kevin@fogcreek.com>
Thu, 15 Dec 2011 13:19:43 -0500
branchstable
changeset 15658 971c55ce03b8
parent 12640 6cc4b14fb76b
child 16913 f2719b387380
permissions -rw-r--r--
largefiles: don't require a user cache (issue3088) (issue3155) If the user cache path isn't specified in .hgrc, and it can't be constructed from the environment, don't try to use that cache.

  $ cat >> $HGRCPATH <<EOF
  > [extensions]
  > graphlog=
  > rebase=
  > 
  > [alias]
  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
  > EOF

  $ hg init repo
  $ cd repo

  $ echo A > a
  $ echo >> a
  $ hg ci -Am A
  adding a

  $ echo B > a
  $ echo >> a
  $ hg ci -m B

  $ echo C > a
  $ echo >> a
  $ hg ci -m C

  $ hg up -q -C 0

  $ echo D >> a
  $ hg ci -Am AD
  created new head

  $ hg tglog
  @  3: 'AD'
  |
  | o  2: 'C'
  | |
  | o  1: 'B'
  |/
  o  0: 'A'
  
  $ hg rebase -s 1 -d 3
  merging a
  merging a
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)

  $ hg tglog
  @  3: 'C'
  |
  o  2: 'B'
  |
  o  1: 'AD'
  |
  o  0: 'A'