author | Pierre-Yves David <pierre-yves.david@fb.com> |
Wed, 29 Apr 2015 10:36:43 -0700 | |
changeset 1290 | 8aa9a21156fe |
parent 1185 | cc3e68120185 |
child 1356 | aff6bc2a6b2d |
permissions | -rw-r--r-- |
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 |
$ hg init public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
$ cd public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 |
$ echo a > a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
$ hg commit -A -m init |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
5 |
adding a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
6 |
$ cd .. |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
7 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
$ evolvepath=$(echo $(dirname $TESTDIR))/hgext/evolve.py |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 |
$ hg clone -U public private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
$ cd private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
$ cat >> .hg/hgrc <<EOF |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
12 |
> [extensions] |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 |
> evolve = $evolvepath |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
> [phases] |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 |
> publish = false |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 |
> EOF |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 |
$ cd .. |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
$ cp -a private alice |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
$ cp -a private bob |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
$ cd alice |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
$ hg update |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
$ echo a >> a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
$ hg commit -u alice -m 'modify a' |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
$ hg push ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
pushing to ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
adding changesets |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
adding manifests |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 |
adding file changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
added 1 changesets with 1 changes to 1 files |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
$ hg log -r 'draft()' |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
changeset: 1:4d1169d82e47 |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
tag: tip |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
user: alice |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
summary: modify a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
$ cd ../bob |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
$ hg pull ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
pulling from ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 |
adding changesets |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 |
adding manifests |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 |
adding file changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 |
added 1 changesets with 1 changes to 1 files |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 |
pull obsolescence markers |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
(run 'hg update' to get a working copy) |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
$ hg log -r 'draft()' |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
changeset: 1:4d1169d82e47 |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
tag: tip |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
user: alice |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
summary: modify a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
$ hg push ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
pushing to ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
adding changesets |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
adding manifests |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
adding file changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
added 1 changesets with 1 changes to 1 files |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
$ hg log -r 'draft()' |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
$ cd ../alice |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
$ hg amend -m 'tweak a' |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
$ hg pull ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
pulling from ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
no changes found |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
pull obsolescence markers |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 |
1 new bumped changesets |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
76 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
$ hg evolve -a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
recreate:[2] tweak a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 |
atop:[1] modify a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 |
computing new diff |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |
committed as 4d1169d82e47 |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
working directory is now at 4d1169d82e47 |