Mercurial > hg-git

changeset 422:09cedf16ecc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix all-version-tests.
author Augie Fackler <durin42@gmail.com>
date Tue, 19 Jul 2011 08:11:02 -0500
parents 31c6154bd88d
children 1189a4f3e238
files hggit/git_handler.py tests/test-git-workflow tests/test-git-workflow.out
diffstat 3 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py	Sun Jul 17 14:01:40 2011 -0500
+++ b/hggit/git_handler.py	Tue Jul 19 08:11:02 2011 -0500
@@ -135,6 +135,7 @@
 
     def import_commits(self, remote_name):
         self.import_git_objects(remote_name)
+        self.update_hg_bookmarks(self.git.get_refs())
         self.save_map()
 
     def fetch(self, remote, heads):
--- a/tests/test-git-workflow	Sun Jul 17 14:01:40 2011 -0500
+++ b/tests/test-git-workflow	Tue Jul 19 08:11:02 2011 -0500
@@ -66,4 +66,5 @@
 echo % get things back to hg
 hg gimport
 hg log --graph --debug | grep -v ': *master'
+echo % gimport should have updated the bookmarks as well
 hg bookmarks
--- a/tests/test-git-workflow.out	Sun Jul 17 14:01:40 2011 -0500
+++ b/tests/test-git-workflow.out	Tue Jul 19 08:11:02 2011 -0500
@@ -45,4 +45,5 @@
    add alpha
 
 
+% gimport should have updated the bookmarks as well
    master                    1:7108ae7bd184