author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
Tue, 11 Oct 2011 19:22:41 +0200 | |
changeset 103 | 23c232a81fbe |
parent 65 | 7c8f992d567e |
permissions | -rw-r--r-- |
63
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 |
|
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 |
$ cat >> $HGRCPATH <<EOF |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 |
> [web] |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 |
> push_ssl = false |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 |
> allow_push = * |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 |
> [extensions] |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 |
> hgext.rebase= |
64
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
8 |
> hgext.mq= |
63
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 |
> EOF |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 |
$ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 |
|
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
12 |
|
64
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
13 |
init stuff |
63
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 |
|
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 |
$ hg init local |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 |
$ cd local |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
$ echo "celestine" > babar |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 |
$ hg add babar |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 |
$ hg ci -m "add babar" |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 |
$ echo "la veille dame" > babar |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
$ hg ci -m "add dame" |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
$ hg up 0 -q |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 |
$ echo "Rataxes" > rhino |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
$ hg add rhino |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 |
$ hg ci -m "add rhino" |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 |
created new head |
64
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
27 |
$ hg published 1 2 |
63
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 |
$ hg up 1 -q |
64
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
29 |
$ hg states draft |
65
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
30 |
$ echo "avion" > vehicule |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
31 |
$ hg add vehicule |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
32 |
$ hg ci -m "add some plane" |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
33 |
$ hg log --template='{rev}:{node|short}: {state}\n' |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
34 |
3:4ee052f12c59: draft |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
35 |
2:5468aa9f5c63: published |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
36 |
1:710fe444b3b0: published |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
37 |
0:5caa672bac26: published |
64
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
38 |
|
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
39 |
test you can't qimport published changeset |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
40 |
|
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
41 |
$ hg qimport -r 1 |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
42 |
abort: can not qimport published changeset 710fe444b3b0 |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
43 |
(see `hg help --extension states` for details) |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
44 |
[255] |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
45 |
|
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
46 |
but other are ok |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
47 |
|
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
48 |
$ hg qimport -r 3 |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
49 |
$ hg qfinish -a |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
50 |
|
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
51 |
test you can't rebase published changeset |
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
52 |
|
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
53 |
$ hg rebase --dest 2 -b 1 |
63
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
54 |
abort: can not rebase published changeset 710fe444b3b0 |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
55 |
(see `hg help --extension states` for details) |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
56 |
[255] |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
57 |
|
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
58 |
test you still can rebase other one |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
59 |
|
65
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
60 |
$ hg rebase --dest 2 -s 3 --detach |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
61 |
saved backup bundle to $TESTTMP/local/.hg/strip-backup/4ee052f12c59-backup.hg |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
62 |
$ hg rebase --dest 1 -s 3 |
7c8f992d567e
[states] fix a bug with rebase --detach
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
64
diff
changeset
|
63 |
saved backup bundle to $TESTTMP/local/.hg/strip-backup/f708bc50a098-backup.hg |
64
6a7dc5ca05b8
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
63
diff
changeset
|
64 |