Mercurial > hg > mercurial-crew
view tests/test-rebase-pull.t @ 23761:a387b0390082
localrepo: show headline notes in commitctx before showing filenames
commitctx already showed notes with filenames but didn't provide any context.
It is just as relevant to know when manifest or changelog is committed.
So, in addition to filenames, also show headlines 'committing files:',
'committing manifest' and 'committing changelog'.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 18 Apr 2014 13:33:20 +0200 |
parents | 4f18e80d9c30 |
children | aa4a1672583e |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > > [alias] > tglog = log -G --template "{rev}: '{desc}' {branches}\n" > EOF $ hg init a $ cd a $ echo C1 > C1 $ hg ci -Am C1 adding C1 $ echo C2 > C2 $ hg ci -Am C2 adding C2 $ cd .. $ hg clone a b updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg clone a c updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd b $ echo L1 > L1 $ hg ci -Am L1 adding L1 $ cd ../a $ echo R1 > R1 $ hg ci -Am R1 adding R1 $ cd ../b Now b has one revision to be pulled from a: $ hg pull --rebase pulling from $TESTTMP/a (glob) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) rebasing 2:ff8d69a621f9 "L1" saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) $ hg tglog @ 3: 'L1' | o 2: 'R1' | o 1: 'C2' | o 0: 'C1' Re-run: $ hg pull --rebase pulling from $TESTTMP/a (glob) searching for changes no changes found Invoke pull --rebase and nothing to rebase: $ cd ../c $ hg book norebase $ hg pull --rebase pulling from $TESTTMP/a (glob) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files nothing to rebase - working directory parent is already an ancestor of destination 77ae9631bcca 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updating bookmark norebase $ hg tglog -l 1 @ 2: 'R1' | pull --rebase --update should ignore --update: $ hg pull --rebase --update pulling from $TESTTMP/a (glob) searching for changes no changes found pull --rebase doesn't update if nothing has been pulled: $ hg up -q 1 $ hg pull --rebase pulling from $TESTTMP/a (glob) searching for changes no changes found $ hg tglog -l 1 o 2: 'R1' | $ cd .. pull --rebase works when a specific revision is pulled (issue3619) $ cd a $ hg tglog @ 2: 'R1' | o 1: 'C2' | o 0: 'C1' $ echo R2 > R2 $ hg ci -Am R2 adding R2 $ echo R3 > R3 $ hg ci -Am R3 adding R3 $ cd ../c $ hg tglog o 2: 'R1' | @ 1: 'C2' | o 0: 'C1' $ echo L1 > L1 $ hg ci -Am L1 adding L1 created new head $ hg pull --rev tip --rebase pulling from $TESTTMP/a (glob) searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files rebasing 3:ff8d69a621f9 "L1" saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) $ hg tglog @ 5: 'L1' | o 4: 'R3' | o 3: 'R2' | o 2: 'R1' | o 1: 'C2' | o 0: 'C1'