tests/test-rebase-pull.t
branchstable
changeset 16228 5b41d5ad52bf
parent 15447 9910f60a37ee
child 16913 f2719b387380
equal deleted inserted replaced
16226:674ecd23c42c 16228:5b41d5ad52bf
    75 
    75 
    76 Invoke pull --rebase and nothing to rebase:
    76 Invoke pull --rebase and nothing to rebase:
    77 
    77 
    78   $ cd ../c
    78   $ cd ../c
    79 
    79 
       
    80   $ hg book norebase
    80   $ hg pull --rebase
    81   $ hg pull --rebase
    81   pulling from $TESTTMP/a (glob)
    82   pulling from $TESTTMP/a (glob)
    82   searching for changes
    83   searching for changes
    83   adding changesets
    84   adding changesets
    84   adding manifests
    85   adding manifests
    85   adding file changes
    86   adding file changes
    86   added 1 changesets with 1 changes to 1 files
    87   added 1 changesets with 1 changes to 1 files
    87   nothing to rebase
    88   nothing to rebase
    88   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    89   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    90   updating bookmark norebase
    89 
    91 
    90   $ hg tglog -l 1
    92   $ hg tglog -l 1
    91   @  2: 'R1'
    93   @  2: 'R1'
    92   |
    94   |
    93 
    95