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.
.hgtags
author Sean Farley <sean.michael.farley@gmail.com>
Fri, 25 Apr 2014 19:58:33 -0500
branchstable
changeset 923 a94ce5400e1b
parent 918 6c5a6c2706f6
child 936 66dab6b2c6e4
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:
270
a68b763505c2 Added tag 0.1.0 for changeset 6c6bb7a23bb5
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     1
 
6c6bb7a23bb5125bf06da73265f039dd3447dafa 0.1.0
287
bcd96748edc4 Added tag 0.2.0 for changeset d3f20770b86a
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 270
diff changeset 
     2
 
d3f20770b86a31dba56ae7b252089e12b34702da 0.2.0
329
786fdc90c8d2 Added tag 0.3.0 for changeset c046b083a5e0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 287
diff changeset 
     3
 
c046b083a5e0b21af69027f31cee141800cf894b 0.3.0
345
62de989b2a02 Added tag 0.4.0 for changeset 9bbcd2746898
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 329
diff changeset 
     4
 
9bbcd274689829d9239978236e16610688978233 0.4.0
352
de3edd3856c3 Added tag 0.4.1 for changeset 4ecbaec1d664
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 345
diff changeset 
     5
 
4ecbaec1d664b1e6f8ebc78292e1ced77a8e69c0 0.4.1
371
381ce7036d6d Added tag 0.5 for changeset 7ef8ab8c6fea
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 352
diff changeset 
     6
 
7ef8ab8c6feadb8a9d9e13af144a17cb23e9a38d 0.5
406
24762f1911ba Added tag 0.6 for changeset 4a5488c01a66
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 371
diff changeset 
     7
 
4a5488c01a66be4729252175cea0ea739a88a540 0.6
425
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 406
diff changeset 
     8
 
18a0d96ed559089edf90206c469f3f8c26681c64 0.7
426
37cba4324ccf Added tag 0.7 for changeset 1b2757c1bd91
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset 
     9
 
18a0d96ed559089edf90206c469f3f8c26681c64 0.7
37cba4324ccf Added tag 0.7 for changeset 1b2757c1bd91
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset 
    10
 
1b2757c1bd918509184f6c1d06b2329a847e31b0 0.7
532
744db7a27dd0 Added tag 1.0.0 for changeset b18b00036355
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 426
diff changeset 
    11
 
b18b000363550f02f413aed008f8e306318c608c 1.0.0
543
108f4ed36215 Added tag 1.0.1 for changeset ca5bb72d14ae
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 532
diff changeset 
    12
 
ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1
563
61e883010b89 Added tag 1.0.2 for changeset b1bdcb4506de
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 543
diff changeset 
    13
 
b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
565
2c57e2b5afde Added tag 1.0.2 for changeset 5559e5a4b656
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 543
diff changeset 
    14
 
5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
600
cd29c8c8b0a1 Added tag 1.1.0 for changeset c062edbcaf13
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 566
diff changeset 
    15
 
c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
614
b082cbe8bd79 Added tag 1.1.0 for changeset 22cacfce2a65
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 600
diff changeset 
    16
 
22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0
605
e0847647fa6a Added tag 2.0.0 for changeset d43e80504e5
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 600
diff changeset 
    17
 
d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0
629
87269fca586b Added tag 2.1.0 for changeset f9d305deeff3
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 616
diff changeset 
    18
 
f9d305deeff3dba782e65faf4ef3fd1569995859 2.1.0
665
bd88067af19d Added tag 3.0.0 for changeset 862b6b71a358
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 629
diff changeset 
    19
 
862b6b71a35836e81f090ba7229c2888e8ed2f9f 3.0.0
719
a0c5d1679354 Added tag 3.1.0 for changeset cdb52bbbe5b8
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 665
diff changeset 
    20
 
cdb52bbbe5b8770d5e68943b7e73bee4ba136ecc 3.1.0
754
671c8bcdcd20 Added tag 3.2.0 for changeset c3ba8a965a7a
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 719
diff changeset 
    21
 
c3ba8a965a7a173e388d84819e936ea9bae9797f 3.2.0
860
f3263e022ba8 Added tag 3.3.0 for changeset 83882f2fbecb
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 754
diff changeset 
    22
 
83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0
918
6c5a6c2706f6 Added tag 3.3.1 for changeset fc04758ea9f5
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 860
diff changeset 
    23
 
fc04758ea9f549684989ee673b04d9724756dc85 3.3.1
evolve