1. Pierre-Yves David
  2. mutable-history

Commits

Pierre-Yves David  committed d912a0c Merge

merge back with stable

  • Participants
  • Parent commits 5527e4f, e084764
  • Branches default

Comments (0)

Files changed (4)

File .hgtags

View file
  • Ignore whitespace
 ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1
 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
+c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
+d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0

File README

View file
  • Ignore whitespace
 Changelog
 ==================
 
- -- 2.0.0
+2.4.0 -- 2012-10-26
 
 - compat with mercurial 2.4
 
- -- 1.1.0
+1.1.0 -- 2012-10-26
 
 - fix troubles creation reporting from rebase
 - rename latecomer to bumped
 - renamed conflicting to divergent
 - smarter divergent handling
 
-1.0.2 --
+1.0.2 -- 2012-09-19
 
 - fix hg fold bug
 - fix hg pull --rebase

File debian/control

View file
  • Ignore whitespace
  Pierre-Yves David <pierre-yves.david@logilab.fr>,
 Standards-Version: 3.9.3
 Build-Depends:
- mercurial (>= 2.3~),
- mercurial-common (>= 2.3~),
+ mercurial (>=2.4~),
+ mercurial-common (>=2.4~),
  python,
  debhelper (>= 8),
  python-sphinx (>= 1.0.8),
 Depends:
  ${python:Depends},
  ${misc:Depends},
- mercurial (>= 2.3~),
+ mercurial (>= 2.4),
 Description: evolve extension for Mercurial
  This package provides the experimental "evolve" extension for the Mercurial
  DVCS.

File hgext/evolve.py

View file
  • Ignore whitespace
 ### Complete troubles computation logic                           ###
 #####################################################################
 
-# there is two kind of trouble not handled by core right now:
-# - bumped: (successors for public changeset)
+# there is one kind of trouble not handled by core right now:
 # - divergent: (two changeset try to succeed to the same precursors)
 #
 # This section add support for those two addition trouble