annotate tests/test-evolve-bumped.t @ 1181:ad7a31a7a413

merge with stable
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 30 Nov 2014 00:11:06 -0800
parents 2c99d92faa62
children cc3e68120185
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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 > rebase =
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
14 > evolve = $evolvepath
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
15 > [phases]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
16 > publish = false
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
17 > EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
18 $ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
19
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 alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
21 $ 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
22
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
23 $ cd alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
24 $ hg update
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
25 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
26 $ echo a >> a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
27 $ 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
28 $ hg push ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
29 pushing to ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
30 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
31 adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
32 adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
33 adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
34 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
35 $ 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
36 changeset: 1:4d1169d82e47
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
37 tag: tip
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
38 user: alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
39 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
40 summary: modify a
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
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
43 $ cd ../bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
44 $ hg pull ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
45 pulling from ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
46 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
47 adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
48 adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
49 adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
50 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
51 pull obsolescence markers
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
52 (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
53 $ 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
54 changeset: 1:4d1169d82e47
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
55 tag: tip
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
56 user: alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
57 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
58 summary: modify a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
59
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
60 $ hg push ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
61 pushing to ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
62 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
63 adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
64 adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
65 adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
66 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
67 $ 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
68
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
69 $ cd ../alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
70 $ 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
71 $ hg pull ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
72 pulling from ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
73 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
74 no changes found
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
75 pull obsolescence markers
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
76 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
77
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
78 $ hg evolve -a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
79 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
80 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
81 computing new diff
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
82 committed as 4d1169d82e47
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
83 working directory is now at 4d1169d82e47