Mercurial > hg > hg-git

changeset 706:4e0e9e25b03b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-pull.t: add test for no-op pull
author Siddharth Agarwal <sid0@fb.com>
date Tue, 04 Mar 2014 16:30:12 -0800
parents 373f854ff58f
children 5e74edb7a62d
files tests/test-pull.t
diffstat 1 files changed, 19 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -37,6 +37,19 @@
      date:        Mon Jan 01 00:00:10 2007 +0000
      summary:     add alpha
   
+no-op pull
+  $ hg -R hgrepo pull -r t_alpha
+  pulling from $TESTTMP/gitrepo
+  no changes found
+
+no-op pull with added bookmark
+  $ cd gitrepo
+  $ git checkout -qb epsilon t_alpha
+  $ cd ..
+  $ hg -R hgrepo pull -r epsilon
+  pulling from $TESTTMP/gitrepo
+  no changes found
+
 pull a branch
   $ hg -R hgrepo pull -r beta
   pulling from $TESTTMP/gitrepo
@@ -52,7 +65,9 @@
   |  summary:     add beta
   |
   @  changeset:   0:3442585be8a6
+     bookmark:    epsilon
      bookmark:    master
+     tag:         default/epsilon
      tag:         default/master
      tag:         t_alpha
      user:        test <test@example.org>
@@ -101,6 +116,8 @@
   |    summary:     add beta
   |
   @  changeset:   0:3442585be8a6
+     bookmark:    epsilon
+     tag:         default/epsilon
      tag:         t_alpha
      user:        test <test@example.org>
      date:        Mon Jan 01 00:00:10 2007 +0000
@@ -154,6 +171,8 @@
   |    summary:     add beta
   |
   @  changeset:   0:3442585be8a6
+     bookmark:    epsilon
+     tag:         default/epsilon
      tag:         t_alpha
      user:        test <test@example.org>
      date:        Mon Jan 01 00:00:10 2007 +0000