Mercurial > hg

comparison tests/test-rebase-pull.t @ 20306:fe8e254c7ad6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents dc5157841361
children 328afbad6e57
comparison
equal deleted inserted replaced
20213:8c69c69dbcd2 20306:fe8e254c7ad6
1 $ cat >> $HGRCPATH <<EOF 1 $ cat >> $HGRCPATH <<EOF
2 > [extensions] 2 > [extensions]
3 > graphlog=
4 > rebase= 3 > rebase=
5 > 4 >
6 > [alias] 5 > [alias]
7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" 6 > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
8 > EOF 7 > EOF
83 searching for changes 82 searching for changes
84 adding changesets 83 adding changesets
85 adding manifests 84 adding manifests
86 adding file changes 85 adding file changes
87 added 1 changesets with 1 changes to 1 files 86 added 1 changesets with 1 changes to 1 files
88 nothing to rebase 87 nothing to rebase - working directory parent is already an ancestor of destination 77ae9631bcca
89 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 88 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
90 updating bookmark norebase 89 updating bookmark norebase
91 90
92 $ hg tglog -l 1 91 $ hg tglog -l 1
93 @ 2: 'R1' 92 @ 2: 'R1'