Skip to content
Snippets Groups Projects
test-outgoing.t 4.38 KiB
Newer Older
Load commonly used test logic
  $ . "$TESTDIR/testutil"

  $ git init gitrepo
  Initialized empty Git repository in $TESTTMP/gitrepo/.git/
David M. Carr's avatar
David M. Carr committed
  $ cd gitrepo
  $ echo alpha > alpha
  $ git add alpha
  $ git branch alpha
  $ git show-ref
  7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha
  7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master
David M. Carr's avatar
David M. Carr committed

  $ cd ..
David M. Carr's avatar
David M. Carr committed
  importing git objects into hg
  updating to bookmark master (hg57 !)
  updating to branch default (no-hg57 !)
David M. Carr's avatar
David M. Carr committed
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd hgrepo
  $ hg book
     alpha                     0:ff7a2f2d8d70
   * master                    0:ff7a2f2d8d70
  $ hg update -q master
David M. Carr's avatar
David M. Carr committed
  $ echo beta > beta
  $ hg add beta
David M. Carr's avatar
David M. Carr committed


  $ echo gamma > gamma
  $ hg add gamma
David M. Carr's avatar
David M. Carr committed

  $ hg book -r 1 beta

  $ hg outgoing | grep -v 'searching for changes'
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:11 2007 +0000
  summary:     add beta
  
  bookmark:    master
David M. Carr's avatar
David M. Carr committed
  tag:         tip
  user:        test
  date:        Mon Jan 01 00:00:12 2007 +0000
  summary:     add gamma
  
  $ hg outgoing -r beta
  comparing with $TESTTMP/gitrepo
  searching for changes
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:11 2007 +0000
  summary:     add beta
  
  $ hg outgoing -r master
  comparing with $TESTTMP/gitrepo
  searching for changes
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:11 2007 +0000
  summary:     add beta
  
  bookmark:    master
David M. Carr's avatar
David M. Carr committed
  tag:         tip
  user:        test
  date:        Mon Jan 01 00:00:12 2007 +0000
  summary:     add gamma
  

  $ cd ..

some more work on master from git
David M. Carr's avatar
David M. Carr committed
  $ cd gitrepo

Check state of refs after outgoing
  $ git show-ref
  7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha
  7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master

David M. Carr's avatar
David M. Carr committed
  $ git checkout master 2>&1 | sed s/\'/\"/g
  Already on "master"
  $ echo delta > delta
  $ git add delta
David M. Carr's avatar
David M. Carr committed

  $ cd ..

  $ cd hgrepo
this will fail # maybe we should try to make it work
David M. Carr's avatar
David M. Carr committed
  $ hg outgoing
  abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
David M. Carr's avatar
David M. Carr committed
  [255]
let's pull and try again
  pulling from */gitrepo (glob)
David M. Carr's avatar
David M. Carr committed
  importing git objects into hg
  (run 'hg heads' to see heads, 'hg merge' to merge)
  $ hg log --graph
  o  changeset:   3:25eed24f5e8f
  |  tag:         default/master
  |  tag:         tip
  |  parent:      0:ff7a2f2d8d70
  |  user:        test <test@example.org>
  |  date:        Mon Jan 01 00:00:13 2007 +0000
  |  summary:     add delta
  |
  | @  changeset:   2:953796e1cfd8
  | |  bookmark:    master
  | |  user:        test
  | |  date:        Mon Jan 01 00:00:12 2007 +0000
  | |  summary:     add gamma
  | |
  | o  changeset:   1:47580592d3d6
  |/   bookmark:    beta
  |    user:        test
  |    date:        Mon Jan 01 00:00:11 2007 +0000
  |    summary:     add beta
  |
  o  changeset:   0:ff7a2f2d8d70
     bookmark:    alpha
     tag:         default/alpha
     user:        test <test@example.org>
     date:        Mon Jan 01 00:00:10 2007 +0000
     summary:     add alpha
  
  $ hg outgoing
  comparing with $TESTTMP/gitrepo
  searching for changes
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:11 2007 +0000
  summary:     add beta
  
  bookmark:    master
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:12 2007 +0000
  summary:     add gamma
  
  $ hg outgoing -r beta
  comparing with $TESTTMP/gitrepo
  searching for changes
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:11 2007 +0000
  summary:     add beta
  
  $ hg outgoing -r master
  comparing with $TESTTMP/gitrepo
  searching for changes
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:11 2007 +0000
  summary:     add beta
  
  bookmark:    master
David M. Carr's avatar
David M. Carr committed
  user:        test
  date:        Mon Jan 01 00:00:12 2007 +0000
  summary:     add gamma
  


  $ cd ..