Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debian/changelog
author Sean Farley <sean.michael.farley@gmail.com>
Fri, 25 Apr 2014 19:58:33 -0500
branchstable
changeset 923 a94ce5400e1b
parent 736 15cc141833d2
child 970 0304fc2bab15
permissions -rw-r--r--
evolve: protect call to rebase within a wlock (#42, #35, #16) Without a wlock, repo.commit would blow away the dirstate's parents on OSes that have no 'os.symlink' support in python, leading evolve to produce a merge instead of a rebase. If a user ran the rebase command instead of evolve, then things would work because rebase is wrapped in a giant wlock. Unfortunately, we can't use the same idea of wrapping the evolve command in one giant wlock because that's too early in the process. If the lock did wrap the entire evolve command, then the working directory would save its current parents which, since rebase hasn't been called yet, would be just p1. Therefore, we need to obtain the lock *after* the dirstate's parents are changed but *before* the call to rebase. This way ensures that when a conflict happens the working directory correctly shows both parent changeset.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
736
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset 
     1
 
mercurial-evolve (3.2.0-1) UNRELEASED; urgency=low
Julien Cristau <julien.cristau@logilab.fr>
parents: 721
diff changeset 
     2
 











Julien Cristau <julien.cristau@logilab.fr>


parents: 
721

diff
changeset




     3


  * New upstream release.












Julien Cristau <julien.cristau@logilab.fr>


parents: 
721

diff
changeset




     4













Julien Cristau <julien.cristau@logilab.fr>


parents: 
721

diff
changeset




     5


 -- Julien Cristau <julien.cristau@logilab.fr>  Tue, 04 Jun 2013 17:28:02 +0200












Julien Cristau <julien.cristau@logilab.fr>


parents: 
721

diff
changeset




     6









721






26930fab9c8e
update debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
628

diff
changeset




     7


mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low













26930fab9c8e
update debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
628

diff
changeset




     8














26930fab9c8e
update debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
628

diff
changeset




     9


  * New upstream release.













26930fab9c8e
update debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
628

diff
changeset




    10














26930fab9c8e
update debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
628

diff
changeset




    11


 -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Mon, 04 Mar 2013 18:02:15 +0100













26930fab9c8e
update debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
628

diff
changeset




    12









628






f9d305deeff3
[prepare] 2.1.0



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
613

diff
changeset




    13


mercurial-evolve (2.1.0-1) UNRELEASED; urgency=low













f9d305deeff3
[prepare] 2.1.0



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
613

diff
changeset




    14














f9d305deeff3
[prepare] 2.1.0



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
613

diff
changeset




    15


  * New upstream release













f9d305deeff3
[prepare] 2.1.0



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
613

diff
changeset




    16














f9d305deeff3
[prepare] 2.1.0



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
613

diff
changeset




    17


 -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Mon, 03 Dec 2012 15:19:19 +0100













f9d305deeff3
[prepare] 2.1.0



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
613

diff
changeset




    18









613






22cacfce2a65
fix version in setup.py



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
568

diff
changeset




    19


mercurial-evolve (1.1.0-1) UNRELEASED; urgency=low













22cacfce2a65
fix version in setup.py



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
568

diff
changeset




    20














22cacfce2a65
fix version in setup.py



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
568

diff
changeset




    21


  * New upstream release.













22cacfce2a65
fix version in setup.py



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
568

diff
changeset




    22














22cacfce2a65
fix version in setup.py



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
568

diff
changeset




    23


 -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Tue, 20 Nov 2012 16:28:12 +0100













22cacfce2a65
fix version in setup.py



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
568

diff
changeset




    24









568






e46a04302e4f
upgrade debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
545

diff
changeset




    25


mercurial-evolve (1.0.2-1) UNRELEASED; urgency=low













e46a04302e4f
upgrade debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
545

diff
changeset




    26














e46a04302e4f
upgrade debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
545

diff
changeset




    27


  * New upstream Release













e46a04302e4f
upgrade debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
545

diff
changeset




    28














e46a04302e4f
upgrade debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
545

diff
changeset




    29


 -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Wed, 19 Sep 2012 17:38:47 +0200













e46a04302e4f
upgrade debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
545

diff
changeset




    30









545






31932df8309a
pkg: proper debian version



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
544

diff
changeset




    31


mercurial-evolve (1.0.1-1) UNRELEASED; urgency=low








544






4dba9a52dcab
pkg: debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    32














4dba9a52dcab
pkg: debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    33


  * New bug fix release













4dba9a52dcab
pkg: debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    34


  * remove conflicting __init__.py













4dba9a52dcab
pkg: debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    35














4dba9a52dcab
pkg: debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    36


 -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Fri, 31 Aug 2012 11:31:03 +0200













4dba9a52dcab
pkg: debian changelog



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    37









531






b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    38


mercurial-evolve (1.0.0-1) UNRELEASED; urgency=low













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    39














b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    40


  * Initial release.













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    41














b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    42


 -- Julien Cristau <jcristau@debian.org>  Fri, 24 Aug 2012 16:46:30 +0200















evolve