Source

hgsubversion hacking / delta-misc.diff

# HG changeset patch
# Date 1241122047 -7200

Miscellanious stuff in the editor...


diff --git a/hg_delta_editor.py b/hg_delta_editor.py
--- a/hg_delta_editor.py
+++ b/hg_delta_editor.py
@@ -6,6 +6,7 @@
 import traceback
 
 from mercurial import context
+from mercurial import error
 from mercurial import hg
 from mercurial import ui
 from mercurial import util
@@ -459,6 +460,7 @@
         return {}
 
     def update_branch_tag_map_for_rev(self, revision):
+        our_util.describe_revision(self.ui, revision)
         paths = revision.paths
         added_branches = {}
         self.added_tags = {}
@@ -487,7 +489,7 @@
                         # exhaustion, and this may be the place to
                         # handle it.
                         if not from_tag:
-                            continue
+                            shouldignore = True
                         else:
                             shouldtag = True
                             branch, src_rev = self.tags[from_tag]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.