author | Anton Shestakov <av6@dwimlabs.net> |
Fri, 08 May 2020 22:50:09 +0800 | |
branch | mercurial-4.6 |
changeset 5368 | 844b1ad5b34b |
parent 5367 | cb5983c0287f |
permissions | -rw-r--r-- |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
1 |
Test script based on sharing.rst: ensure that all scenarios in that |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
2 |
document work as advertised. |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
3 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
4 |
Setting things up |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
5 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
6 |
$ cat >> $HGRCPATH <<EOF |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
7 |
> [alias] |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
8 |
> shortlog = log --template '{rev}:{node|shortest} {phase} {desc|firstline}\n' |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
9 |
> [extensions] |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
10 |
> rebase = |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
11 |
> EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1737
diff
changeset
|
12 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
13 |
$ hg init public |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
14 |
$ hg clone public test-repo |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
15 |
updating to branch default |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
16 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
17 |
$ hg clone test-repo dev-repo |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
18 |
updating to branch default |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
19 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
20 |
$ cat >> test-repo/.hg/hgrc <<EOF |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
21 |
> [phases] |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
22 |
> publish = false |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
23 |
> EOF |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
24 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
25 |
To start things off, let's make one public, immutable changeset:: |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
26 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
27 |
$ cd test-repo |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
28 |
$ echo 'my new project' > file1 |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
29 |
$ hg add file1 |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
30 |
$ hg commit -m'create new project' |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
31 |
$ hg push |
1475
192bc96d0226
test-sharing: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1451
diff
changeset
|
32 |
pushing to $TESTTMP/public (glob) |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
33 |
searching for changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
34 |
adding changesets |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
35 |
adding manifests |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
36 |
adding file changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
37 |
added 1 changesets with 1 changes to 1 files |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
38 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
39 |
and pull that into the development repository:: |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
40 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
41 |
$ cd ../dev-repo |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
42 |
$ hg pull -u |
1475
192bc96d0226
test-sharing: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1451
diff
changeset
|
43 |
pulling from $TESTTMP/test-repo (glob) |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
44 |
requesting all changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
45 |
adding changesets |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
46 |
adding manifests |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
47 |
adding file changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
48 |
added 1 changesets with 1 changes to 1 files |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
49 |
new changesets 0dc9c9f6ab91 |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
50 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
51 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
52 |
Let's commit a preliminary change and push it to ``test-repo`` for |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
53 |
testing. :: |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
54 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
55 |
$ echo 'fix fix fix' > file1 |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
56 |
$ hg commit -m'prelim change' |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
57 |
$ hg push -q ../test-repo |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
58 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
59 |
Figure SG01 (roughly) |
4931
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
60 |
$ hg -R ../dev-repo shortlog -G |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
61 |
@ 1:f649 draft prelim change |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
62 |
| |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
63 |
o 0:0dc9 public create new project |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
64 |
|
4931
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
65 |
$ hg -R ../test-repo shortlog -G |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
66 |
o 1:f649 draft prelim change |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
67 |
| |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
68 |
@ 0:0dc9 public create new project |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
69 |
|
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
70 |
Now let's switch to test-repo to test our change and amend:: |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
71 |
$ cd ../test-repo |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
72 |
$ hg update -q |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
73 |
$ echo 'Fix fix fix' > file1 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
74 |
$ hg amend -m'fix bug 37' |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
75 |
$ echo 'Fix fix fix.' > file1 |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
76 |
$ hg amend -m'fix bug 37' |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
77 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
78 |
Figure SG02 |
4931
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
79 |
$ hg -R ../dev-repo shortlog --hidden -G |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
80 |
@ 1:f649 draft prelim change |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
81 |
| |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
82 |
o 0:0dc9 public create new project |
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
83 |
|
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
84 |
$ hg -R ../test-repo shortlog --hidden -G |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
85 |
@ 3:522d draft fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
86 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
87 |
| x 2:96d8 draft fix bug 37 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
88 |
|/ |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
89 |
| x 1:f649 draft prelim change |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
90 |
|/ |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
91 |
o 0:0dc9 public create new project |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
92 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
93 |
Pull into dev-repo: obsolescence markers are transferred, but not |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
94 |
the new obsolete changeset. |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
95 |
$ cd ../dev-repo |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
96 |
$ hg pull -u |
1475
192bc96d0226
test-sharing: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1451
diff
changeset
|
97 |
pulling from $TESTTMP/test-repo (glob) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
98 |
searching for changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
99 |
adding changesets |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
100 |
adding manifests |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
101 |
adding file changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
102 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
103 |
2 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
104 |
obsoleted 1 changesets |
4971
9f69164cdc16
test-compat: merge mercurial-4.8 into mercurial-4.7
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
105 |
new changesets 522d503432a2 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
106 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
107 |
updated to "522d503432a2: fix bug 37" |
1616
c216b175d535
tests: add head warning messages
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1595
diff
changeset
|
108 |
1 other heads for branch "default" |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
109 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
110 |
Figure SG03 |
4931
6408d7a01b59
tests: add shortlog of other repos to test-sharing.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4930
diff
changeset
|
111 |
$ hg -R ../dev-repo shortlog --hidden -G |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
112 |
@ 2:522d draft fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
113 |
| |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
114 |
| x 1:f649 draft prelim change |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
115 |
|/ |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
116 |
o 0:0dc9 public create new project |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
117 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
118 |
Amend again in dev-repo |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
119 |
$ echo 'Fix, fix, and fix' > file1 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
120 |
$ hg amend |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
121 |
$ echo 'Fix, fix, and fix.' > file1 |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
122 |
$ hg amend |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
123 |
$ hg push -q |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
124 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
125 |
Figure SG04 (dev-repo) |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
126 |
$ hg shortlog --hidden -G |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
127 |
@ 4:7b49 draft fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
128 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
129 |
| x 3:e42b draft fix bug 37 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
130 |
|/ |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
131 |
| x 2:522d draft fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
132 |
|/ |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
133 |
| x 1:f649 draft prelim change |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
134 |
|/ |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
135 |
o 0:0dc9 public create new project |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
136 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
137 |
Figure SG04 (test-repo) |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
138 |
$ cd ../test-repo |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
139 |
$ hg update |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
140 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
141 |
updated to "7b49f864d655: fix bug 37" |
1616
c216b175d535
tests: add head warning messages
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1595
diff
changeset
|
142 |
1 other heads for branch "default" |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
143 |
$ hg shortlog --hidden -G |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
144 |
@ 4:7b49 draft fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
145 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
146 |
| x 3:522d draft fix bug 37 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
147 |
|/ |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
148 |
| x 2:96d8 draft fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
149 |
|/ |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
150 |
| x 1:f649 draft prelim change |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
151 |
|/ |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
152 |
o 0:0dc9 public create new project |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
153 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
154 |
This bug fix is finished. We can push it to the public repository. |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
155 |
$ hg push |
1110
875e671c3cd8
test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
156 |
pushing to $TESTTMP/public (glob) |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
157 |
searching for changes |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
158 |
adding changesets |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
159 |
adding manifests |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
160 |
adding file changes |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
161 |
added 1 changesets with 1 changes to 1 files |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
162 |
4 new obsolescence markers |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
163 |
|
1263
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
164 |
Now that the fix is public, we cannot amend it any more. |
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
165 |
$ hg amend -m 'fix bug 37' |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
166 |
abort: cannot amend public changesets: 7b49f864d655 |
2787
ebca049e8ca9
amend: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2710
diff
changeset
|
167 |
(see 'hg help phases' for details) |
1263
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
168 |
[255] |
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
169 |
|
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
170 |
Figure SG05 |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
171 |
$ hg -R ../public shortlog -G |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
172 |
o 1:7b49 public fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
173 |
| |
4930
44f340c2a8eb
tests: use |shortest in test-sharing.t because sharing.rst uses it
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
174 |
o 0:0dc9 public create new project |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
175 |
|
1263
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
176 |
Oops, still have draft changesets in dev-repo: push the phase change there. |
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
177 |
$ hg -R ../dev-repo shortlog -r 'draft()' |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
178 |
4:7b49 draft fix bug 37 |
1263
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
179 |
$ hg push ../dev-repo |
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
180 |
pushing to ../dev-repo |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
181 |
searching for changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
182 |
no changes found |
1263
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
183 |
[1] |
eb0a1d1d499b
docs: sharing guide: clarify end-game of "Example 2"
Greg Ward <greg@gerg.ca>
parents:
1261
diff
changeset
|
184 |
$ hg -R ../dev-repo shortlog -r 'draft()' |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
185 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
186 |
Sharing with multiple developers: code review |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
187 |
|
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
188 |
$ cd .. |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
189 |
$ hg clone public review |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
190 |
updating to branch default |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
191 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
192 |
$ hg clone review alice |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
193 |
updating to branch default |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
194 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
195 |
$ hg clone review bob |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
196 |
updating to branch default |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
197 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
198 |
$ cat >> review/.hg/hgrc <<EOF |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
199 |
> [phases] |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
200 |
> publish = false |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
201 |
> EOF |
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
202 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
203 |
Alice commits a draft bug fix, pushes to review repo. |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
204 |
$ cd alice |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
205 |
$ hg bookmark bug15 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
206 |
$ echo 'fix' > file2 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
207 |
$ hg commit -A -u alice -m 'fix bug 15 (v1)' |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
208 |
adding file2 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
209 |
$ hg push -B bug15 |
1475
192bc96d0226
test-sharing: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1451
diff
changeset
|
210 |
pushing to $TESTTMP/review (glob) |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
211 |
searching for changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
212 |
adding changesets |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
213 |
adding manifests |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
214 |
adding file changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
215 |
added 1 changesets with 1 changes to 1 files |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
216 |
exporting bookmark bug15 |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
217 |
$ hg -R ../review bookmarks |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
218 |
bug15 2:4e965c66c983 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
219 |
|
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
220 |
Alice receives code review, amends her fix, and goes out to lunch to |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
221 |
await second review. |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
222 |
$ echo 'Fix.' > file2 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
223 |
$ hg amend -m 'fix bug 15 (v2)' |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
224 |
$ hg push |
1475
192bc96d0226
test-sharing: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1451
diff
changeset
|
225 |
pushing to $TESTTMP/review (glob) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
226 |
searching for changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
227 |
adding changesets |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
228 |
adding manifests |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
229 |
adding file changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
230 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
231 |
1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
232 |
obsoleted 1 changesets |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
233 |
updating bookmark bug15 |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
234 |
$ hg -R ../review bookmarks |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
235 |
bug15 3:3363442626b3 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
236 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
237 |
Figure SG06: review repository after Alice pushes her amended changeset. |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
238 |
$ hg --hidden -R ../review shortlog -G -r 1:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
239 |
o 3:3363 draft fix bug 15 (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
240 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
241 |
| x 2:4e96 draft fix bug 15 (v1) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
242 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
243 |
@ 1:7b49 public fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
244 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
245 |
~ |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
246 |
|
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
247 |
Bob commits a draft changeset, pushes to review repo. |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
248 |
$ cd ../bob |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
249 |
$ echo 'stuff' > file1 |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
250 |
$ hg bookmark featureX |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
251 |
$ hg commit -u bob -m 'implement feature X (v1)' |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
252 |
$ hg push -B featureX |
1475
192bc96d0226
test-sharing: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1451
diff
changeset
|
253 |
pushing to $TESTTMP/review (glob) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
254 |
searching for changes |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
255 |
remote has heads on branch 'default' that are not known locally: 3363442626b3 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
256 |
adding changesets |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
257 |
adding manifests |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
258 |
adding file changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
259 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
260 |
exporting bookmark featureX |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
261 |
$ hg -R ../review bookmarks |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
262 |
bug15 3:3363442626b3 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
263 |
featureX 4:c7ff98c7916f |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
264 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
265 |
Bob receives first review, amends and pushes. |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
266 |
$ echo 'do stuff' > file1 |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
267 |
$ hg amend -m 'implement feature X (v2)' |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
268 |
$ hg push |
1475
192bc96d0226
test-sharing: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1451
diff
changeset
|
269 |
pushing to $TESTTMP/review (glob) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
270 |
searching for changes |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
271 |
remote has heads on branch 'default' that are not known locally: 3363442626b3 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
272 |
adding changesets |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
273 |
adding manifests |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
274 |
adding file changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
275 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
276 |
1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
277 |
obsoleted 1 changesets |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
278 |
updating bookmark featureX |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
279 |
|
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
280 |
Bob receives second review, amends, and pushes to public: |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
281 |
this time, he's sure he got it right! |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
282 |
$ echo 'Do stuff.' > file1 |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
283 |
$ hg amend -m 'implement feature X (v3)' |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
284 |
$ hg push ../public |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
285 |
pushing to ../public |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
286 |
searching for changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
287 |
adding changesets |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
288 |
adding manifests |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
289 |
adding file changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
290 |
added 1 changesets with 1 changes to 1 files |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
291 |
2 new obsolescence markers |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
292 |
$ hg -R ../public bookmarks |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
293 |
no bookmarks set |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
294 |
$ hg push ../review |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
295 |
pushing to ../review |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
296 |
searching for changes |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
297 |
remote has heads on branch 'default' that are not known locally: 3363442626b3 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
298 |
adding changesets |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
299 |
adding manifests |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
300 |
adding file changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
301 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
302 |
1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
303 |
obsoleted 1 changesets |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
304 |
updating bookmark featureX |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
305 |
$ hg -R ../review bookmarks |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
306 |
bug15 3:3363442626b3 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
307 |
featureX 6:9d21d673314a |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
308 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
309 |
Figure SG07: review and public repos after Bob implements feature X. |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
310 |
$ hg --hidden -R ../review shortlog -G -r 1:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
311 |
o 6:9d21 public implement feature X (v3) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
312 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
313 |
| x 5:1bb4 draft implement feature X (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
314 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
315 |
| x 4:c7ff draft implement feature X (v1) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
316 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
317 |
| o 3:3363 draft fix bug 15 (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
318 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
319 |
| x 2:4e96 draft fix bug 15 (v1) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
320 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
321 |
@ 1:7b49 public fix bug 37 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
322 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
323 |
~ |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
324 |
$ hg --hidden -R ../public shortlog -G -r 1:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
325 |
o 2:9d21 public implement feature X (v3) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
326 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
327 |
o 1:7b49 public fix bug 37 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
328 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
329 |
~ |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
330 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
331 |
Meantime, Alice is back from lunch. While she was away, Bob approved |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
332 |
her change, so now she can publish it. |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
333 |
$ cd ../alice |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
334 |
$ hg --hidden shortlog -G -r 1:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
335 |
@ 3:3363 draft fix bug 15 (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
336 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
337 |
| x 2:4e96 draft fix bug 15 (v1) |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
338 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
339 |
o 1:7b49 public fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
340 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
341 |
~ |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
342 |
$ hg outgoing -q ../public |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
343 |
3:3363442626b3 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
344 |
$ hg push ../public |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
345 |
pushing to ../public |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
346 |
searching for changes |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
347 |
remote has heads on branch 'default' that are not known locally: 9d21d673314a |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
348 |
abort: push creates new remote head 3363442626b3 with bookmark 'bug15'! |
1737
5383671ef612
evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com>
parents:
1641
diff
changeset
|
349 |
(pull and merge or see 'hg help push' for details about pushing new heads) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
350 |
[255] |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
351 |
$ hg pull ../public |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
352 |
pulling from ../public |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
353 |
searching for changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
354 |
adding changesets |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
355 |
adding manifests |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
356 |
adding file changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
357 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
358 |
2 new obsolescence markers |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
359 |
new changesets 9d21d673314a |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
360 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
361 |
$ hg log -G -q -r 'head()' |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
362 |
o 4:9d21d673314a |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
363 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
364 |
~ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
365 |
@ 3:3363442626b3 |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
366 |
| |
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
367 |
~ |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
368 |
$ hg --hidden shortlog -G -r 1:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
369 |
o 4:9d21 public implement feature X (v3) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
370 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
371 |
| @ 3:3363 draft fix bug 15 (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
372 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
373 |
| x 2:4e96 draft fix bug 15 (v1) |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
374 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
375 |
o 1:7b49 public fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
376 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
377 |
~ |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
378 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
379 |
Alice rebases her draft changeset on top of Bob's public changeset and |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
380 |
publishes the result. |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
381 |
$ hg rebase -d 4 |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
382 |
rebasing 3:3363442626b3 "fix bug 15 (v2)" (bug15) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
383 |
$ hg push ../public |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
384 |
pushing to ../public |
1259
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
385 |
searching for changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
386 |
adding changesets |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
387 |
adding manifests |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
388 |
adding file changes |
0daf56a2032d
docs: update sharing guide based (mostly) on marmoute's review
Greg Ward <greg@gerg.ca>
parents:
1130
diff
changeset
|
389 |
added 1 changesets with 1 changes to 1 files |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
390 |
2 new obsolescence markers |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
391 |
$ hg push ../review |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
392 |
pushing to ../review |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
393 |
searching for changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
394 |
adding changesets |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
395 |
adding manifests |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
396 |
adding file changes |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
397 |
added 1 changesets with 0 changes to 1 files |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1451
diff
changeset
|
398 |
1 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
399 |
obsoleted 1 changesets |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
400 |
updating bookmark bug15 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
401 |
|
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
402 |
Figure SG08: review and public changesets after Alice pushes. |
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
403 |
$ hg --hidden -R ../review shortlog -G -r 1:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
404 |
o 7:dd15 public fix bug 15 (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
405 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
406 |
o 6:9d21 public implement feature X (v3) |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
407 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
408 |
| x 5:1bb4 draft implement feature X (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
409 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
410 |
| x 4:c7ff draft implement feature X (v1) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
411 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
412 |
| x 3:3363 draft fix bug 15 (v2) |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
413 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
414 |
| x 2:4e96 draft fix bug 15 (v1) |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
415 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
416 |
@ 1:7b49 public fix bug 37 |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
417 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
418 |
~ |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
419 |
$ hg --hidden -R ../public shortlog -G -r 1:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
420 |
o 3:dd15 public fix bug 15 (v2) |
1261
56cc2eb5995a
docs: add code review scenario to sharing guide
Greg Ward <greg@gerg.ca>
parents:
1259
diff
changeset
|
421 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
422 |
o 2:9d21 public implement feature X (v3) |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
423 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
424 |
o 1:7b49 public fix bug 37 |
979
c7b2ccd99dab
docs: add guide to sharing mutable history
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
425 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
426 |
~ |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
427 |
$ cd .. |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
428 |
|
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
429 |
Setup for shared mutable history (to illustrate content-divergence and |
4471
3caa4a459439
tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4181
diff
changeset
|
430 |
phase-divergent changesets). |
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
431 |
|
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
432 |
$ rm -rf review alice bob |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
433 |
$ hg clone public alice |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
434 |
updating to branch default |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
435 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
436 |
$ hg clone public bob |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
437 |
updating to branch default |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
438 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
439 |
$ cat >> alice/.hg/hgrc <<EOF |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
440 |
> [phases] |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
441 |
> publish = false |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
442 |
> EOF |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
443 |
$ cp alice/.hg/hgrc bob/.hg/hgrc |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
444 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
445 |
Now we'll have Bob commit a bug fix that could still be improved:: |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
446 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
447 |
$ cd bob |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
448 |
$ echo 'pretty good fix' >> file1 |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
449 |
$ hg commit -u bob -m 'fix bug 24 (v1)' |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
450 |
$ hg shortlog -r . |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
451 |
4:b2be draft fix bug 24 (v1) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
452 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4181
diff
changeset
|
453 |
Alice pulls Bob's draft changeset and amends it herself. :: |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
454 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
455 |
$ cd ../alice |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
456 |
$ hg pull -u ../bob |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
457 |
pulling from ../bob |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
458 |
searching for changes |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
459 |
adding changesets |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
460 |
adding manifests |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
461 |
adding file changes |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
462 |
added 1 changesets with 1 changes to 1 files |
4971
9f69164cdc16
test-compat: merge mercurial-4.8 into mercurial-4.7
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
463 |
new changesets b2be254b3b9f |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
464 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
465 |
$ echo 'better fix (alice)' >> file1 |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
466 |
$ hg amend -u alice -m 'fix bug 24 (v2 by alice)' |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
467 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
468 |
Bob implements a better fix of his own:: |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
469 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
470 |
$ cd ../bob |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
471 |
$ echo 'better fix (bob)' >> file1 |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
472 |
$ hg amend -u bob -m 'fix bug 24 (v2 by bob)' |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
473 |
$ hg --hidden shortlog -G -r 3:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
474 |
@ 5:541f draft fix bug 24 (v2 by bob) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
475 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
476 |
| x 4:b2be draft fix bug 24 (v1) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
477 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
478 |
o 3:dd15 public fix bug 15 (v2) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
479 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
480 |
~ |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
481 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
482 |
Bob discovers the divergence. |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
483 |
$ hg pull ../alice |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
484 |
pulling from ../alice |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
485 |
searching for changes |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
486 |
adding changesets |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
487 |
adding manifests |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
488 |
adding file changes |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
489 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
490 |
1 new obsolescence markers |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
491 |
2 new content-divergent changesets |
4971
9f69164cdc16
test-compat: merge mercurial-4.8 into mercurial-4.7
Pierre-Yves David <pierre-yves.david@octobus.net>
diff
changeset
|
492 |
new changesets e3a586fd2377 |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
493 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
494 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
495 |
Figure SG09: multiple heads! divergence! oh my! |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
496 |
$ hg --hidden shortlog -G -r 3:: |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
497 |
* 6:e3a5 draft fix bug 24 (v2 by alice) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
498 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
499 |
| @ 5:541f draft fix bug 24 (v2 by bob) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
500 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
501 |
| x 4:b2be draft fix bug 24 (v1) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
502 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
503 |
o 3:dd15 public fix bug 15 (v2) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
504 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
505 |
~ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
506 |
$ hg --hidden shortlog -r 'successors(b2be)' |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
507 |
5:541f draft fix bug 24 (v2 by bob) |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
508 |
6:e3a5 draft fix bug 24 (v2 by alice) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
509 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
510 |
Use evolve to fix the divergence. |
3802
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
511 |
$ cat > editor.sh <<EOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
512 |
> #!/bin/sh |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
513 |
> cat > \$1 <<ENDOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
514 |
> fix bug 24 (v2 by bob) |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
515 |
> ENDOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
516 |
> EOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
517 |
|
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
518 |
$ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
519 |
merge:[5] fix bug 24 (v2 by bob) |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
520 |
with: [6] fix bug 24 (v2 by alice) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
521 |
base: [4] fix bug 24 (v1) |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
522 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
5345
a73cdef2e33f
evolve: rename `evolve_source_*` to `divergence_source_*`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5341
diff
changeset
|
523 |
working directory is now at f92394e17e33 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
524 |
$ hg log -q -r 'contentdivergent()' |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
525 |
|
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
526 |
Figure SG10: Bob's repository after fixing divergence. |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
527 |
$ hg --hidden shortlog -G -r 3:: |
5345
a73cdef2e33f
evolve: rename `evolve_source_*` to `divergence_source_*`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5341
diff
changeset
|
528 |
@ 7:f923 draft fix bug 24 (v2 by bob) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
529 |
| |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
530 |
| x 6:e3a5 draft fix bug 24 (v2 by alice) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
531 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
532 |
| x 5:541f draft fix bug 24 (v2 by bob) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
533 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
534 |
| x 4:b2be draft fix bug 24 (v1) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
535 |
|/ |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
536 |
o 3:dd15 public fix bug 15 (v2) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
537 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1616
diff
changeset
|
538 |
~ |
5325
304de9a04172
tests: avoid referring to commits by hash in a few places
Martin von Zweigbergk <martinvonz@google.com>
parents:
4935
diff
changeset
|
539 |
$ hg --hidden shortlog -r 'predecessors(.)' |
4935
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
540 |
5:541f draft fix bug 24 (v2 by bob) |
3874bc10d4a7
docs: add two more amend commits to simulate temporary amend commits
Anton Shestakov <av6@dwimlabs.net>
parents:
4933
diff
changeset
|
541 |
6:e3a5 draft fix bug 24 (v2 by alice) |
1265
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
542 |
$ cat file1 |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
543 |
Do stuff. |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
544 |
pretty good fix |
14f91037d2f6
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca>
parents:
1263
diff
changeset
|
545 |
better fix (alice) |