author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
Mon, 12 Sep 2011 23:47:06 +0200 | |
changeset 63 | f47a5f990eb2 |
child 64 | 6a7dc5ca05b8 |
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= |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 |
> EOF |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 |
$ 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
|
10 |
|
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 |
test you can't rebase published changeset |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
13 |
|
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 |
$ hg init local |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 |
$ cd local |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 |
$ echo "celestine" > babar |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
$ hg add babar |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 |
$ hg ci -m "add babar" |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 |
$ echo "la veille dame" > babar |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 |
$ hg ci -m "add dame" |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
$ hg log --template='{rev}:{node|short}: {state}\n' |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
1:710fe444b3b0: published |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 |
0:5caa672bac26: published |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
$ hg up 0 -q |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 |
$ echo "Rataxes" > rhino |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 |
$ hg add rhino |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
27 |
$ hg ci -m "add rhino" |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 |
created new head |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 |
$ hg up 1 -q |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 |
$ hg rebase |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 |
abort: can not rebase published changeset 710fe444b3b0 |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 |
(see `hg help --extension states` for details) |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 |
[255] |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 |
|
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
35 |
test you still can rebase other one |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 |
|
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
37 |
$ hg published 1 2 |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
38 |
$ hg states draft |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
39 |
$ echo "flore" > babar |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 |
$ hg ci -m "add daughter" |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 |
$ hg rebase --dest 2 |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 |
abort: can not rebase published changeset 710fe444b3b0 |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 |
(see `hg help --extension states` for details) |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 |
[255] |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
45 |
$ hg rebase --dest 2 -s 3 |
f47a5f990eb2
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
46 |
saved backup bundle to $TESTTMP/local/.hg/strip-backup/b7f6698b7ad7-backup.hg |