Mercurial > evolve

annotate .hgtags @ 3738:ed3f69fb67bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix the conflicts error message during content-divergence resolution Before last patch, we didn't had an automated way to continue an interrupted content-divergence resolution and we used to show a very long error message on how to continue manually. This patch replaces that long error message with nice small message which tells how to continue and how to abort. We still show `hg update -C .` to abort as we need to test and make `--abort` work in case of content-divergence.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 19:04:18 +0530
parents 69d6271f1067
children 4f147d56980c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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 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
10 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
11 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
12 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
13 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
14 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
15 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
16 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
17 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
18 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
19 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
20 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
21 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
22 fc04758ea9f549684989ee673b04d9724756dc85 3.3.1
936
66dab6b2c6e4 Added tag 3.3.2 for changeset a03ea39aca2a
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 918
diff changeset
23 a03ea39aca2a66ea36817512d586dcbc99dbfe9b 3.3.2
971
fc7ca26f7491 Added tag 4.0.0 for changeset 0304fc2bab15
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 936
diff changeset
24 0304fc2bab158658df53a8f4edd5aa300a9497d2 4.0.0
1031
acc2b590edd9 Added tag 4.0.1 for changeset e914884fb721
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 971
diff changeset
25 e914884fb7210d6350d94909cb25ebc602359680 4.0.1
1050
d265efad02cc Added tag 4.1.0 for changeset 4d5d101e878f
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1031
diff changeset
26 4d5d101e878f6d6264a8e036b11afdf922c4ef94 4.1.0
1139
07ccf868dfe1 Added tag 5.0.0 for changeset c13b408c0006
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1050
diff changeset
27 c13b408c00066af78cda88734909c6f2f3505f76 5.0.0
1176
7a1d4dcc465f Added tag 5.0.1 for changeset 51e1e962172c
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1139
diff changeset
28 51e1e962172c0178394cd36652d90181319f5416 5.0.1
1178
c4eb9ce7b6a1 Added tag 5.0.1 for changeset 0f3090785283
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1176
diff changeset
29 0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1
1190
1df0bf41016c Added tag 5.0.2 for changeset dbd0733e5840
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1178
diff changeset
30 dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2
1199
47f3bdbe0d9c Added tag 5.1.0 for changeset bfe9be352453
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1190
diff changeset
31 bfe9be352453640233371cc7deb409a09decacf9 5.1.0
1207
1e7c8046a9f4 Added tag 5.1.1 for changeset 9b8628e0a142
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1199
diff changeset
32 9b8628e0a142e0e094e27430c388e3c12ceba513 5.1.1
1231
5b6c42a3e12f Added tag 5.1.2 for changeset e886bc501796
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1207
diff changeset
33 e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2
1258
8873aedbd83d Added tag 5.1.3 for changeset c52c15100fb2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1231
diff changeset
34 c52c15100fb2d85c3525d6d085b3663ec4f90fe6 5.1.3
1282
2da7b531879a Added tag 5.1.4 for changeset 891c3ce894fa
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1258
diff changeset
35 891c3ce894fa879532299910735bcc2a968245b1 5.1.4
1425
e8f875227901 Added tag 5.1.5 for changeset 1377f6a7f9ec
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1282
diff changeset
36 1377f6a7f9ecb25e9b8885fce8f6f42e0d6f3f12 5.1.5
1456
773f3edb3cb2 Added tag 5.2.0 for changeset 00026533ff9f
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1425
diff changeset
37 c79bdc8563509cd4e99946593d0b39af40271a30 5.2.0
773f3edb3cb2 Added tag 5.2.0 for changeset 00026533ff9f
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1425
diff changeset
38 00026533ff9f52733a45df008e3d56a5d3a8e76a 5.2.0
1461
dd89ed2bb77e Added tag 5.2.0 for changeset 44a9dcb3fefc
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1456
diff changeset
39 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0
1520
681f675401ff Added tag 5.2.1 for changeset c15d6168412f
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1461
diff changeset
40 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1
1613
4bb48b1da1f8 Added tag 5.3.0 for changeset bd59cc2ee203
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1520
diff changeset
41 bd59cc2ee2039c370a0343f683488cde2a106565 5.3.0
1703
3460887b6859 Added tag 5.4.0 for changeset b21ce82e6f76
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1613
diff changeset
42 b21ce82e6f7640c2b38506545968650227d67e9b 5.4.0
1718
54f40b722cf9 Added tag 5.4.1 for changeset 2ad40d972a74
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1703
diff changeset
43 2ad40d972a740a613c4c559104166a015b37cac2 5.4.1
1766
c56b6210dd6c Added tag 5.5.0 for changeset 727c7211c810
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1718
diff changeset
44 727c7211c810d304ebf92b32db7ecf697ce46ac6 5.5.0
1793
12a0805fca23 Added tag 5.6.0 for changeset 99ede2d77545
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1766
diff changeset
45 99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
1803
54120614e9e5 Update tag 5.6.0 for changeset e7b6e9c4a5d4
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1793
diff changeset
46 99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
54120614e9e5 Update tag 5.6.0 for changeset e7b6e9c4a5d4
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1793
diff changeset
47 e7b6e9c4a5d4317f56c2862910c569723b6ea71b 5.6.0
1814
efda653c96a7 Added tag 5.6.1 for changeset 70694b2621ba
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1803
diff changeset
48 70694b2621ba9d919bc38303f8901e84caf5da0f 5.6.1
2264
237ea5ce21a3 Added tag 6.0.0 for changeset 165ad227993d
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1814
diff changeset
49 165ad227993de4e7d819cc6c820d5b9f7b38b80d 6.0.0
2284
1b6d4d176145 Added tag 6.0.1 for changeset 5ef112a6eb87
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2264
diff changeset
50 5ef112a6eb875633a7925cde61b7d2d9e65b3a56 6.0.1
2323
673de955b14d Added tag 6.1.0 for changeset 8510d3fd7c3b
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2284
diff changeset
51 8510d3fd7c3b312dc731f4c29badc415d504558a 6.1.0
2436
71d242e0fc1a Added tag 6.2.0 for changeset d4ee0274a8ef
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2323
diff changeset
52 d4ee0274a8efbaf3d73a659998248c379c61c2bf 6.2.0
2472
3722b2ac1853 Added tag 6.2.1 for changeset 0af99106b075
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2436
diff changeset
53 0af99106b0754426913b5c82fb52dc70d4d299f6 6.2.1
2536
4c07dfedba32 Added tag 6.3.0 for changeset 6da4ca7b3e4f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2472
diff changeset
54 6da4ca7b3e4fc214a363a5cf723554f114b7f51e 6.3.0
2545
cb0d62ed5e2a Added tag 6.3.1 for changeset e358c0263e46
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2536
diff changeset
55 e358c0263e4629746a7c925429c951f67d4b02b1 6.3.1
2621
9f91f4ea7623 Added tag 6.4.0 for changeset e60248f26f92
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2545
diff changeset
56 e60248f26f923f4460682252f7863ff86f7b86b0 6.4.0
2707
7ed2ad612921 Added tag 6.5.0 for changeset 734c0bc066cd
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2621
diff changeset
57 734c0bc066cdc0121a20a9cb44c8cc30c653be94 6.5.0
2813
31c4086c943e Added tag 6.6.0 for changeset cc3e09e033a3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2707
diff changeset
58 cc3e09e033a3c632c9ac35badbf8b5d53f584049 6.6.0
3011
40c856d224d2 Added tag 6.7.0 for changeset 3a4f75c6619c
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2813
diff changeset
59 3a4f75c6619c7ef7d78ee0912efd6cb01d55b521 6.7.0
3056
9360d7ad7270 Added tag 6.7.1 for changeset 430ad68292d7
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3011
diff changeset
60 430ad68292d76b9387d1eeadf289951f51fd88d3 6.7.1
3126
70dbd02f5869 Added tag 6.8.0 for changeset ec0bbf26ce7f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3056
diff changeset
61 ec0bbf26ce7fadd42c637e01d3750dac96ac0b1b 6.8.0
3164
47baf8b6c724 Added tag 7.0.0 for changeset c56c028f3802
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3126
diff changeset
62 c56c028f3802202241551e5953bea74ab3a6c434 7.0.0
3193
735b763f06c7 Added tag 7.0.1 for changeset e7a2a6158077
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3164
diff changeset
63 c4940c22d76b9c6b3c2117a3b490f3c4fd796972 7.0.1
3292
014cf11ca2dc Added tag 7.1.0 for changeset 06a3cb594956
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3193
diff changeset
64 06a3cb59495636df8b567e49a0fd7fd8fd823074 7.1.0
3421
5432872341c9 Added tag 7.2.0 for changeset bf6b859807ba
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3292
diff changeset
65 bf6b859807bac23752a26e58876fe3a4a9a2fef8 7.2.0
3443
337c740327b9 Added tag 7.2.1 for changeset 6c772398eb4e
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3421
diff changeset
66 6c772398eb4e209914e1074cdac4f3ebf714e437 7.2.1
3594
3e638a94ff18 Added tag 7.3.0 for changeset e4ac2e2c2086
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3443
diff changeset
67 e4ac2e2c2086f977afa35e23a62f849e9305a225 7.3.0
3721
69d6271f1067 Added tag 8.0.0 for changeset 116cdd8c102a
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3594
diff changeset
68 116cdd8c102ab0ae6295fb4886b0882e75e4d8f7 8.0.0