Martin Geisler avatar Martin Geisler committed 8598727

Small fix in commit msg

Comments (0)

Files changed (1)

 # HG changeset patch
 # User Henrik Stuart <hg@hstuart.dk>
 # Date 1295774638 -3600
-# Node ID 26636bf9ca499c94d2de3e963bafdff7ff664418
-# Parent 57d433f632b7f76dea25cd38d0a8f4028d4dd1b8
+# Node ID af7e034f9ea327eddd524ca69023fe1ec84a433b
+# Parent  0d1dca7d2a041cb1cb6c6bd90608aa87068bde02
 add support for marking changesets as dead
 
 Marking a changeset as dead is, if it is a head, a way to delete a branch of
   0 ---- 1
 
 It would receive both changesets 2 and 3 after a pull/push since 2 kills the
-local open head 1.
+local non-dead head 1.
 
 Had the base repository been:
 
   0 ---- 1 ---- 2 (dead)
    \      \
-    ---- 3 ---- 4
+    ------ 3 ---- 4
 
 Then no matter if the other repository was 0, or 0 ---- 1, then it would
 receive changesets 3 and 4 as new heads, but not changeset 2 as 4 ressurrects
 diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
 --- a/hgext/bookmarks.py
 +++ b/hgext/bookmarks.py
-@@ -306,7 +306,7 @@
+@@ -309,7 +309,7 @@
              finally:
                  wlock.release()
  
              result = super(bookmark_repo, self).pull(remote, heads, force)
  
              self.ui.debug("checking for updated bookmarks\n")
-@@ -332,7 +332,7 @@
+@@ -335,7 +335,7 @@
  
              return result
  
 diff --git a/mercurial/revlog.py b/mercurial/revlog.py
 --- a/mercurial/revlog.py
 +++ b/mercurial/revlog.py
-@@ -400,7 +400,7 @@
+@@ -398,7 +398,7 @@
                      yield i
                      break
  
          """Return the ancestors of heads that are not ancestors of common.
  
          More specifically, return a list of nodes N such that every N
-@@ -420,8 +420,12 @@
+@@ -418,8 +418,12 @@
          if heads is None:
              heads = self.heads()
  
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.