comparison tests/test-corrupt.t @ 2020:143c8e4dc22d

topic: merge the topic extension in the evolve repository There is a lot of synergy between the two concepts. Topic is expected to be able to smooth multiple of evolution sharp edge. Having them both in the same repository will make this collaboration easier.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 02 Mar 2017 18:07:46 +0100
parents 9f42f819267b
children 4dd84054ebbb
comparison
equal deleted inserted replaced
2019:996a562b6c9f 2020:143c8e4dc22d
1
2 $ cat >> $HGRCPATH <<EOF
3 > [defaults]
4 > amend=-d "0 0"
5 > [web]
6 > push_ssl = false
7 > allow_push = *
8 > [phases]
9 > publish = False
10 > [alias]
11 > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n'
12 > [diff]
13 > git = 1
14 > unified = 0
15 > [extensions]
16 > hgext.graphlog=
17 > EOF
18 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
19 $ mkcommit() {
20 > echo "$1" >> "$1"
21 > hg add "$1"
22 > hg ci -m "add $1"
23 > }
24
25 $ hg init local
26 $ hg init other
27 $ cd local
28 $ touch 1 2 3 4 5 6 7 8 9 0
29 $ hg add 1 2 3 4 5 6 7 8 9 0
30 $ mkcommit A
31 $ mkcommit B
32 $ mkcommit C
33 $ hg glog
34 @ changeset: 2:829b19580856
35 | tag: tip
36 | user: test
37 | date: Thu Jan 01 00:00:00 1970 +0000
38 | summary: add C
39 |
40 o changeset: 1:97b8f02ab29e
41 | user: test
42 | date: Thu Jan 01 00:00:00 1970 +0000
43 | summary: add B
44 |
45 o changeset: 0:5d8dabd3961b
46 user: test
47 date: Thu Jan 01 00:00:00 1970 +0000
48 summary: add A
49
50 $ hg push ../other
51 pushing to ../other
52 searching for changes
53 adding changesets
54 adding manifests
55 adding file changes
56 added 3 changesets with 13 changes to 13 files
57
58
59 $ hg -R ../other verify
60 checking changesets
61 checking manifests
62 crosschecking files in changesets and manifests
63 checking files
64 13 files, 3 changesets, 13 total revisions
65 $ mkcommit D
66 $ mkcommit E
67 $ hg up -q .^^
68 $ hg revert -r tip -a -q
69 $ hg ci -m 'coin' -q
70 $ hg glog
71 @ changeset: 5:8313a6afebbb
72 | tag: tip
73 | parent: 2:829b19580856
74 | user: test
75 | date: Thu Jan 01 00:00:00 1970 +0000
76 | summary: coin
77 |
78 | o changeset: 4:076ec8ade1ac
79 | | user: test
80 | | date: Thu Jan 01 00:00:00 1970 +0000
81 | | summary: add E
82 | |
83 | o changeset: 3:824d9bb109f6
84 |/ user: test
85 | date: Thu Jan 01 00:00:00 1970 +0000
86 | summary: add D
87 |
88 o changeset: 2:829b19580856
89 | user: test
90 | date: Thu Jan 01 00:00:00 1970 +0000
91 | summary: add C
92 |
93 o changeset: 1:97b8f02ab29e
94 | user: test
95 | date: Thu Jan 01 00:00:00 1970 +0000
96 | summary: add B
97 |
98 o changeset: 0:5d8dabd3961b
99 user: test
100 date: Thu Jan 01 00:00:00 1970 +0000
101 summary: add A
102
103
104 $ hg prune --fold -n -1 -- -2 -3
105 2 changesets pruned
106 $ hg push ../other
107 pushing to ../other
108 searching for changes
109 adding changesets
110 adding manifests
111 adding file changes
112 added 1 changesets with 2 changes to 2 files
113 2 new obsolescence markers
114 $ hg -R ../other verify
115 checking changesets
116 checking manifests
117 crosschecking files in changesets and manifests
118 checking files
119 15 files, 4 changesets, 15 total revisions
120
121
122