| branch | stable |
| changeset 1450 | 5f6e78aea094 |
| parent 1422 | c868a69c29c5 |
| child 1453 | 8ca31deb8db7 |
| 1438:3295353b1363 | 1450:5f6e78aea094 |
|---|---|
1 $ hg init public |
1 $ hg init public |
2 $ cd public |
2 $ cd public |
3 $ echo a > a |
3 $ echo a > a |
4 $ mkcommit() { |
|
5 > echo "$1" > "$1" |
|
6 > hg add "$1" |
|
7 > hg ci -m "add $1" |
|
8 > } |
|
4 $ hg commit -A -m init |
9 $ hg commit -A -m init |
5 adding a |
10 adding a |
6 $ cd .. |
11 $ cd .. |
7 |
12 |
8 $ evolvepath=$(echo $(dirname $TESTDIR))/hgext/evolve.py |
13 $ evolvepath=$(echo $(dirname $TESTDIR))/hgext/evolve.py |
9 $ hg clone -U public private |
14 $ hg clone -U public private |
10 $ cd private |
15 $ cd private |
11 $ cat >> .hg/hgrc <<EOF |
16 $ cat >> .hg/hgrc <<EOF |
12 > [extensions] |
17 > [extensions] |
13 > evolve = $evolvepath |
18 > evolve = $evolvepath |
19 > [ui] |
|
20 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n |
|
14 > [phases] |
21 > [phases] |
15 > publish = false |
22 > publish = false |
16 > EOF |
23 > EOF |
17 $ cd .. |
24 $ cd .. |
18 |
25 |
30 adding changesets |
37 adding changesets |
31 adding manifests |
38 adding manifests |
32 adding file changes |
39 adding file changes |
33 added 1 changesets with 1 changes to 1 files |
40 added 1 changesets with 1 changes to 1 files |
34 $ hg log -r 'draft()' |
41 $ hg log -r 'draft()' |
35 changeset: 1:4d1169d82e47 |
42 1:4d1169d82e47@default(draft) modify a |
36 tag: tip |
|
37 user: alice |
|
38 date: Thu Jan 01 00:00:00 1970 +0000 |
|
39 summary: modify a |
|
40 |
|
41 |
43 |
42 $ cd ../bob |
44 $ cd ../bob |
43 $ hg pull ../private |
45 $ hg pull ../private |
44 pulling from ../private |
46 pulling from ../private |
45 searching for changes |
47 searching for changes |
48 adding file changes |
50 adding file changes |
49 added 1 changesets with 1 changes to 1 files |
51 added 1 changesets with 1 changes to 1 files |
50 pull obsolescence markers |
52 pull obsolescence markers |
51 (run 'hg update' to get a working copy) |
53 (run 'hg update' to get a working copy) |
52 $ hg log -r 'draft()' |
54 $ hg log -r 'draft()' |
53 changeset: 1:4d1169d82e47 |
55 1:4d1169d82e47@default(draft) modify a |
54 tag: tip |
|
55 user: alice |
|
56 date: Thu Jan 01 00:00:00 1970 +0000 |
|
57 summary: modify a |
|
58 |
|
59 $ hg push ../public |
56 $ hg push ../public |
60 pushing to ../public |
57 pushing to ../public |
61 searching for changes |
58 searching for changes |
62 adding changesets |
59 adding changesets |
63 adding manifests |
60 adding manifests |
72 searching for changes |
69 searching for changes |
73 no changes found |
70 no changes found |
74 pull obsolescence markers |
71 pull obsolescence markers |
75 1 new bumped changesets |
72 1 new bumped changesets |
76 |
73 |
77 $ hg evolve -a |
74 $ hg evolve -a -A --bumped |
78 recreate:[2] tweak a |
75 recreate:[2] tweak a |
79 atop:[1] modify a |
76 atop:[1] modify a |
80 computing new diff |
77 computing new diff |
81 committed as 4d1169d82e47 |
78 committed as 4d1169d82e47 |
82 working directory is now at 4d1169d82e47 |
79 working directory is now at 4d1169d82e47 |
80 |
|
81 Bumped Merge changeset: |
|
82 ----------------------- |
|
83 |
|
84 We currently cannot automatically solve bumped changeset that is the |
|
85 product of a merge, we add a test for it. |
|
86 |
|
87 $ mkcommit _a |
|
88 $ hg up .^ |
|
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
90 $ mkcommit _b |
|
91 created new head |
|
92 $ mkcommit _c |
|
93 $ hg log -G |
|
94 @ 5:eeaf70969381@default(draft) add _c |
|
95 | |
|
96 o 4:6612fc0ddeb6@default(draft) add _b |
|
97 | |
|
98 | o 3:154ad198ff4a@default(draft) add _a |
|
99 |/ |
|
100 o 1:4d1169d82e47@default(public) modify a |
|
101 | |
|
102 o 0:d3873e73d99e@default(public) init |
|
103 |
|
104 $ hg merge 3 |
|
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 (branch merge, don't forget to commit) |
|
107 $ hg commit -m "merge" |
|
108 $ hg commit --amend -m "New message" |
|
109 $ hg phase --public 551127da2a8a --hidden |
|
110 1 new bumped changesets |
|
111 $ hg log -G |
|
112 @ 7:b28e84916d8c@default(draft) New message |
|
113 |\ |
|
114 +---o 6:551127da2a8a@default(public) merge |
|
115 | |/ |
|
116 | o 5:eeaf70969381@default(public) add _c |
|
117 | | |
|
118 | o 4:6612fc0ddeb6@default(public) add _b |
|
119 | | |
|
120 o | 3:154ad198ff4a@default(public) add _a |
|
121 |/ |
|
122 o 1:4d1169d82e47@default(public) modify a |
|
123 | |
|
124 o 0:d3873e73d99e@default(public) init |
|
125 |
|
126 $ hg evolve --all --bumped |
|
127 skipping b28e84916d8c : we do not handle merge yet |