| author | Alain Leufroy <alain.leufroy@logilab.fr> |
| Tue, 27 Sep 2011 11:25:13 +0200 | |
| changeset 99 | 67a3aa020d91 |
| child 100 | 7d0617e584ff |
| permissions | -rwxr-xr-x |
|
99
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
1 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
2 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
3 |
$ cat >> $HGRCPATH <<EOF |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
4 |
> [web] |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
5 |
> push_ssl = false |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
6 |
> allow_push = * |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
7 |
> [extensions] |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
8 |
> hgext.mq= |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
9 |
> hgext.graphlog= |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
10 |
> EOF |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
11 |
$ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
12 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
13 |
$ mkcommit() { |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
14 |
> echo "$1" > "$1" |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
15 |
> hg add "$1" |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
16 |
> hg ci -m "$1" |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
17 |
> } |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
18 |
$ alias hglog='hg glog --template "{rev} {state} {node}\n"' |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
19 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
20 |
$ hg init alpha |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
21 |
$ cd alpha |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
22 |
$ hg states draft ready |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
23 |
$ mkcommit 0 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
24 |
$ mkcommit 1 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
25 |
$ hg up 0 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
26 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
27 |
$ mkcommit 2 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
28 |
created new head |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
29 |
$ mkcommit 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
30 |
$ mkcommit 4 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
31 |
$ hg up 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
32 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
33 |
$ mkcommit 5 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
34 |
created new head |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
35 |
$ hg up 1 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
36 |
1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
37 |
$ mkcommit 6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
38 |
$ hg published 6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
39 |
$ hg ready 4 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
40 |
$ hglog |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
41 |
@ 6 published 2a653cad66937648173a936140f09a0e780afd76 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
42 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
43 |
| o 5 draft ffe7eb8acef3efeceaa566b85a1ac419b0ecb856 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
44 |
| | |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
45 |
| | o 4 ready 138777f75ddeb6ee0b527cfdb0eebbd1e0037bf6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
46 |
| |/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
47 |
| o 3 ready 0915e256b0ca7f81dace67bc6fd512bfd1bcab85 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
48 |
| | |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
49 |
| o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
50 |
| | |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
51 |
o | 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
52 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
53 |
o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
54 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
55 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
56 |
We strip a published heads, so published heads 6 -> 1 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
57 |
$ hg strip -n 6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
58 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
59 |
$ hglog |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
60 |
o 5 draft ffe7eb8acef3efeceaa566b85a1ac419b0ecb856 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
61 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
62 |
| o 4 ready 138777f75ddeb6ee0b527cfdb0eebbd1e0037bf6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
63 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
64 |
o 3 ready 0915e256b0ca7f81dace67bc6fd512bfd1bcab85 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
65 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
66 |
o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
67 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
68 |
| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
69 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
70 |
o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
71 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
72 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
73 |
Back to the previous configuration. |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
74 |
Then strip accros branches and remove draft changesets completly, and cut in |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
75 |
the middle of ready changesets |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
76 |
$ hg up 1 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
77 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
78 |
$ mkcommit 6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
79 |
$ hg strip -n 3:6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
80 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
81 |
$ hglog |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
82 |
o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
83 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
84 |
| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
85 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
86 |
o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
87 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
88 |
Now merge 1 & 2 then strip merging changeset |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
89 |
$ hg up 1 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
90 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
91 |
$ hg merge 2 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
92 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
93 |
(branch merge, don't forget to commit) |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
94 |
$ hg commit -m Merge |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
95 |
$ hg strip -n 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
96 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
97 |
$ hglog |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
98 |
o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
99 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
100 |
| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
101 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
102 |
o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
103 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
104 |
Do the same but with merge changeset as ready |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
105 |
$ hg up 1 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
106 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
107 |
$ hg merge 2 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
108 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
109 |
(branch merge, don't forget to commit) |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
110 |
$ hg commit -m Merge |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
111 |
$ hg ready 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
112 |
$ hg strip -n 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
113 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
114 |
$ hglog |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
115 |
o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
116 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
117 |
| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
118 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
119 |
o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
120 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
121 |
$ hg log --template "{rev} {node}\n" -r 'readyheads()' |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
122 |
2 a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
123 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
124 |
pathologic case |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
125 |
$ hg up 1 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
126 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
127 |
$ mkcommit 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
128 |
$ hg up 2 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
129 |
1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
130 |
$ hg merge 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
131 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
132 |
(branch merge, don't forget to commit) |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
133 |
$ hg ci -m '4' |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
134 |
$ mkcommit 5 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
135 |
$ hg up 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
136 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
137 |
$ mkcommit 6 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
138 |
created new head |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
139 |
$ hg published 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
140 |
$ hg ready 4 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
141 |
$ hglog |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
142 |
@ 6 draft aeb74c71311d9305498bbf371746d095b80ff51f |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
143 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
144 |
| o 5 draft 0777a3135ec5396c57db4402c71ab8cba2a0ef7e |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
145 |
| | |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
146 |
| o 4 ready 667667458ecc8cf7763dee1ae172a5a9ebf115f3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
147 |
|/| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
148 |
o | 3 published 03fc50a1c0074093104ff6c5357c486781742b64 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
149 |
| | |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
150 |
| o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
151 |
| | |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
152 |
o | 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
153 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
154 |
o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
155 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
156 |
$ hg strip -n 3 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
157 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
158 |
$ hglog |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
159 |
o 2 ready a00ba83de58390cbbdae1fc580df0bb0db2e8e88 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
160 |
| |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
161 |
| @ 1 published e8342c9a2ed18fb27f9fdfc48a3105d164a06e77 |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
162 |
|/ |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
163 |
o 0 published 06254b90631198c9b9e426be9886af92fedc9a2d |
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
164 |
|
|
67a3aa020d91
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
diff
changeset
|
165 |
# |