Mercurial > evolve

annotate tests/test-obsolete.t @ 52:62bdc2567099

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rollback support
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 08 Sep 2011 17:32:51 +0200
parents d98e06ab8320
children d7b11772f0b5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
1 $ cat >> $HGRCPATH <<EOF
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
2 > [web]
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
3 > push_ssl = false
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
4 > allow_push = *
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
5 > [extensions]
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
6 > EOF
51
d98e06ab8320 move extensions in a hgext directory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 50
diff changeset
7 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
8 $ mkcommit() {
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
9 > echo "$1" > "$1"
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
10 > hg add "$1"
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
11 > hg ci -m "add $1"
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
12 > }
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
13
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
14 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
15 $ hg init local
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
16 $ cd local
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
17 $ mkcommit a # 0
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
18 $ mkcommit b # 1
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
19 $ mkcommit c # 2
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
20 $ hg up 1
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
21 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
22 $ mkcommit obsol_c # 3
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
23 created new head
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
24 $ hg debugobsolete 3 2
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
25
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
26
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
27 Test that obsolete changeset are hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
28
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
29 $ qlog
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
30 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
31 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
32 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
33 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
34 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
35 - 1f0dee641bb7
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
36 $ qlog --hidden
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
37 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
38 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
39 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
40 - 4538525df7e2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
41 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
42 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
43 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
44 - 1f0dee641bb7
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
45 $ qlog -r 'obsolete()' --hidden
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
46 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
47 - 4538525df7e2
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
48
40
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
49 test obsolete changeset with no-obsolete descendant
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
50 $ hg up 1 -q
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
51 $ mkcommit "obsol_c'" # 4 (on 1)
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
52 created new head
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
53 $ hg debugobsolete 4 3
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
54 $ qlog
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
55 4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
56 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
57 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
58 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
59 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
60 - 1f0dee641bb7
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
61 $ qlog -r 'obsolete()' --hidden
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
62 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
63 - 4538525df7e2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
64 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
65 - 0d3f46688ccc
40
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
66 $ hg up 3 -q
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
67 $ mkcommit d # 5 (on 3)
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
68 $ qlog -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
69 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
70 - 0d3f46688ccc
40
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
71
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
72 Test communication of obsolete relation with a compatible client
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
73
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
74 $ hg init ../other-new
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
75 $ hg push --traceback ../other-new
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
76 pushing to ../other-new
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
77 searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
78 adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
79 adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
80 adding file changes
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
81 added 5 changesets with 5 changes to 5 files (+1 heads)
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
82 $ qlog -R ../other-new -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
83 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
84 - 0d3f46688ccc
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
85 $ qlog -R ../other-new
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
86 4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
87 - a7a6f2b5d8a5
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
88 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
89 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
90 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
91 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
92 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
93 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
94 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
95 - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
96 $ hg up 3 -q
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
97 $ mkcommit obsol_d # 6
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
98 created new head
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
99 $ hg debugobsolete 6 5
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
100 $ qlog
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
101 6
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
102 - 95de7fc6918d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
103 4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
104 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
105 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
106 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
107 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
108 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
109 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
110 - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
111 $ qlog -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
112 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
113 - 0d3f46688ccc
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
114 $ hg push ../other-new -f # XXX should not have to use -f
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
115 pushing to ../other-new
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
116 searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
117 adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
118 adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
119 adding file changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
120 added 1 changesets with 1 changes to 1 files (+1 heads)
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
121 $ qlog -R ../other-new
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
122 5
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
123 - 95de7fc6918d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
124 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
125 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
126 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
127 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
128 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
129 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
130 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
131 - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
132 $ qlog -R ../other-new -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
133 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
134 - 0d3f46688ccc
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
135 $ hg up -q .^
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
136 $ mkcommit "obsol_d'" # 7
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
137 created new head
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
138 $ hg debugobsolete 7 6
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
139 $ hg pull -R ../other-new .
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
140 pulling from .
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
141 searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
142 adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
143 adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
144 adding file changes
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
145 added 2 changesets with 2 changes to 2 files (+2 heads)
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
146 (run 'hg heads .' to see heads, 'hg merge' to merge)
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
147 $ qlog -R ../other-new
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
148 7
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
149 - 909a0fb57e5d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
150 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
151 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
152 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
153 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
154 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
155 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
156 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
157 - 1f0dee641bb7
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
158
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
159 pushing to stuff that doesn't support obsolete
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
160
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
161 $ hg init ../other-old
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
162 $ echo '[extensions]' > ../other-old/.hg/hgrc
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
163 $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
164 $ hg push ../other-old
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
165 pushing to ../other-old
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
166 searching for changes
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
167 adding changesets
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
168 adding manifests
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
169 adding file changes
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
170 added 5 changesets with 5 changes to 5 files (+1 heads)
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
171 $ qlog -R ../other-old
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
172 4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
173 - 909a0fb57e5d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
174 3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
175 - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
176 2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
177 - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
178 1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
179 - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
180 0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
181 - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
182
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
183 clone support
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
184
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
185 $ hg clone . ../cloned
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
186 requesting all changes
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
187 adding changesets
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
188 adding manifests
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
189 adding file changes
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
190 added 8 changesets with 8 changes to 8 files (+4 heads)
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
191 updating to branch default
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
192 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
193
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
194 $ qlog -R ../cloned
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
195 7
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
196 - 909a0fb57e5d
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
197 4
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
198 - 725c380fe99b
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
199 3
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
200 - 0d3f46688ccc
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
201 1
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
202 - 7c3bad9141dc
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
203 0
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
204 - 1f0dee641bb7
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
205
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
206 Test rollback support
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
207
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
208 $ hg up .^ -q
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
209 $ mkcommit "obsol_d''"
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
210 created new head
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
211 $ hg debugobsolete 8 7
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
212 $ hg -R ../other-new pull .
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
213 pulling from .
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
214 searching for changes
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
215 adding changesets
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
216 adding manifests
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
217 adding file changes
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
218 added 1 changesets with 1 changes to 1 files (+1 heads)
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
219 (run 'hg heads .' to see heads, 'hg merge' to merge)
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
220
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
221 $ qlog -R ../other-new
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
222 8
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
223 - 159dfc9fa5d3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
224 3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
225 - 725c380fe99b
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
226 2
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
227 - 0d3f46688ccc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
228 1
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
229 - 7c3bad9141dc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
230 0
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
231 - 1f0dee641bb7
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
232 $ hg -R ../other-new rollback
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
233 repository tip rolled back to revision 7 (undo pull)
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
234 working directory now based on revision -1
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
235 $ qlog -R ../other-new
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
236 7
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
237 - 909a0fb57e5d
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
238 3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
239 - 725c380fe99b
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
240 2
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
241 - 0d3f46688ccc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
242 1
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
243 - 7c3bad9141dc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
244 0
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
245 - 1f0dee641bb7
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
246