author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
Tue, 07 Aug 2012 15:04:03 +0200 | |
changeset 438 | b1b7b5ef506a |
parent 385 | cdcdedc532b7 |
child 441 | d702f0d26c6a |
permissions | -rw-r--r-- |
284
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
1 |
$ cat >> $HGRCPATH <<EOF |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
2 |
> [defaults] |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
3 |
> amend=-d "0 0" |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
4 |
> [extensions] |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
5 |
> hgext.rebase= |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
6 |
> hgext.graphlog= |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
7 |
> EOF |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
8 |
$ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
9 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
10 |
|
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
11 |
$ glog() { |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
12 |
> hg glog --template \ |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
13 |
> '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@" |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
14 |
> } |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
15 |
|
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
16 |
Test stabilize removing the changeset being stabilized |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
17 |
|
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
18 |
$ hg init empty |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
19 |
$ cd empty |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
20 |
$ echo a > a |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
21 |
$ hg ci -Am adda a |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
22 |
$ echo b > b |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
23 |
$ hg ci -Am addb b |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
24 |
$ echo a >> a |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
25 |
$ hg ci -m changea |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
26 |
$ hg bookmark changea |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
27 |
$ hg up 1 |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
28 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
29 |
$ echo a >> a |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
30 |
$ hg amend -m changea |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
31 |
1 new unstables changesets |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
32 |
$ hg stabilize -v |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
33 |
move:[2] changea |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
34 |
atop:[4] changea |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
35 |
hg rebase -Dr cce2c55b8965 -d 1447e1c4828d |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
36 |
resolving manifests |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
37 |
$ glog --hidden |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
38 |
@ 4:1447e1c4828d@default(draft) bk:[changea] changea |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
39 |
| |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
346
diff
changeset
|
40 |
| x 3:41ad4fe8c795@default(draft) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a |
284
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
41 |
| | |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
346
diff
changeset
|
42 |
| | x 2:cce2c55b8965@default(draft) bk:[] changea |
284
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
43 |
| |/ |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
346
diff
changeset
|
44 |
| x 1:102a90ea7b4a@default(draft) bk:[] addb |
284
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
45 |
|/ |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
46 |
o 0:07f494440405@default(draft) bk:[] adda |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
47 |
|
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
48 |
$ hg debugsuccessors |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
49 |
102a90ea7b4a 1447e1c4828d |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
50 |
41ad4fe8c795 1447e1c4828d |
88a851a54f26
evolve: fix relocate() with removed revision
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
51 |
cce2c55b8965 000000000000 |