evolve: tests/test-sharing.t annotate

annotate tests/test-sharing.t @ 2856:f6517779a7c4

warning: rename warning message divergent has been renamed into contentdivergent. Use their renamed counterpart in warning message for new unstable changesets. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary

author	Boris Feld <boris.feld@octobus.net>
date	Thu, 24 Aug 2017 09:12:09 +0200
parents	f588de9dd067
children	4b934144ed11

rev	line source
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]
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	8 > shortlog = log --template '{rev}:{node\|short} {phase} {desc\|firstline}\n'
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
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	49 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	50
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	51 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	52 testing. ::
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	53
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	54 $ echo 'fix fix fix' > file1
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	55 $ hg commit -m'prelim change'
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	56 $ hg push -q ../test-repo
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	57
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	58 Figure SG01 (roughly)
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	59 $ hg shortlog -G
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	60 @ 1:f6490818a721 draft prelim change
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	61 \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	62 o 0:0dc9c9f6ab91 public create new project
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	63
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	64 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	65 $ cd ../test-repo
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	66 $ hg update -q
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	67 $ echo 'Fix fix fix.' > file1
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	68 $ hg amend -m'fix bug 37'
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	69
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	70 Figure SG02
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	71 $ hg shortlog --hidden -G
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	72 @ 3:60ffde5765c5 draft fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	73 \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	74 \| x 2:2a039763c0f4 draft temporary amend commit for f6490818a721
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	75 \| \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	76 \| x 1:f6490818a721 draft prelim change
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 o 0:0dc9c9f6ab91 public create new project
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	79
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	80 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	81 the new obsolete changeset.
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	82 $ cd ../dev-repo
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	83 $ hg pull -u
1475 192bc96d0226 test-sharing: fix globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1451 diff changeset	84 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	85 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	86 adding changesets
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	87 adding manifests
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	88 adding file changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	89 added 1 changesets with 1 changes to 1 files (+1 heads)
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	90 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	91 obsoleted 1 changesets
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2709 5d54de9cf50f merge back with stable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2698 diff changeset	93 updated to "60ffde5765c5: fix bug 37"
1616 c216b175d535 tests: add head warning messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 1595 diff changeset	94 1 other heads for branch "default"
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	95
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	96 Figure SG03
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	97 $ hg shortlog --hidden -G
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	98 @ 2:60ffde5765c5 draft fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	99 \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	100 \| x 1:f6490818a721 draft prelim change
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	101 \|/
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	102 o 0:0dc9c9f6ab91 public create new project
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	103
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	104 Amend again in dev-repo
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	105 $ echo 'Fix, fix, and fix.' > file1
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	106 $ hg amend
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	107 $ hg push -q
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	108
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	109 Figure SG04 (dev-repo)
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	110 $ hg shortlog --hidden -G
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	111 @ 4:de6151c48e1c draft fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	112 \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	113 \| x 3:ad19d3570adb draft temporary amend commit for 60ffde5765c5
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	114 \| \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	115 \| x 2:60ffde5765c5 draft fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	116 \|/
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	117 \| x 1:f6490818a721 draft prelim change
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	118 \|/
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	119 o 0:0dc9c9f6ab91 public create new project
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	120
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	121 Figure SG04 (test-repo)
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	122 $ cd ../test-repo
1259 0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	123 $ hg update
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	124 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2709 5d54de9cf50f merge back with stable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2698 diff changeset	125 updated to "de6151c48e1c: fix bug 37"
1616 c216b175d535 tests: add head warning messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 1595 diff changeset	126 1 other heads for branch "default"
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	127 $ hg shortlog --hidden -G
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	128 @ 4:de6151c48e1c draft fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	129 \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	130 \| x 3:60ffde5765c5 draft fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	131 \|/
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	132 \| x 2:2a039763c0f4 draft temporary amend commit for f6490818a721
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	133 \| \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	134 \| x 1:f6490818a721 draft prelim change
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	135 \|/
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	136 o 0:0dc9c9f6ab91 public create new project
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	137
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	138 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	139 $ 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	140 pushing to $TESTTMP/public (glob)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	141 searching for changes
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	142 adding changesets
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	143 adding manifests
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	144 adding file changes
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	145 added 1 changesets with 1 changes to 1 files
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	146 4 new obsolescence markers
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	147
1263 eb0a1d1d499b docs: sharing guide: clarify end-game of "Example 2" Greg Ward <greg@gerg.ca> parents: 1261 diff changeset	148 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	149 $ hg amend -m 'fix bug 37'
2787 ebca049e8ca9 amend: use precheck to validate revision Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2710 diff changeset	150 abort: cannot amend public changesets: de6151c48e1c
ebca049e8ca9 amend: use precheck to validate revision Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2710 diff changeset	151 (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	152 [255]
eb0a1d1d499b docs: sharing guide: clarify end-game of "Example 2" Greg Ward <greg@gerg.ca> parents: 1261 diff changeset	153
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	154 Figure SG05
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	155 $ hg -R ../public shortlog -G
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	156 o 1:de6151c48e1c public fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	157 \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	158 o 0:0dc9c9f6ab91 public create new project
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	159
1263 eb0a1d1d499b docs: sharing guide: clarify end-game of "Example 2" Greg Ward <greg@gerg.ca> parents: 1261 diff changeset	160 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	161 $ hg -R ../dev-repo shortlog -r 'draft()'
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	162 4:de6151c48e1c draft fix bug 37
1263 eb0a1d1d499b docs: sharing guide: clarify end-game of "Example 2" Greg Ward <greg@gerg.ca> parents: 1261 diff changeset	163 $ hg push ../dev-repo
eb0a1d1d499b docs: sharing guide: clarify end-game of "Example 2" Greg Ward <greg@gerg.ca> parents: 1261 diff changeset	164 pushing to ../dev-repo
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	165 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	166 no changes found
1263 eb0a1d1d499b docs: sharing guide: clarify end-game of "Example 2" Greg Ward <greg@gerg.ca> parents: 1261 diff changeset	167 [1]
eb0a1d1d499b docs: sharing guide: clarify end-game of "Example 2" Greg Ward <greg@gerg.ca> parents: 1261 diff changeset	168 $ hg -R ../dev-repo shortlog -r 'draft()'
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	169
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	170 Sharing with multiple developers: code review
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	171
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	172 $ cd ..
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	173 $ 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	174 updating to branch default
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	175 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	176 $ 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	177 updating to branch default
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	178 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	179 $ hg clone review bob
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	180 updating to branch default
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	181 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	182 $ cat >> review/.hg/hgrc <<EOF
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	183 > [phases]
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	184 > publish = false
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	185 > EOF
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	186
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	187 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	188 $ cd alice
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	189 $ hg bookmark bug15
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	190 $ echo 'fix' > file2
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	191 $ 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	192 adding file2
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	193 $ hg push -B bug15
1475 192bc96d0226 test-sharing: fix globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1451 diff changeset	194 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	195 searching for changes
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	196 adding changesets
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	197 adding manifests
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	198 adding file changes
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	199 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	200 exporting bookmark bug15
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	201 $ hg -R ../review bookmarks
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	202 bug15 2:f91e97234c2b
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	203
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	204 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	205 await second review.
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 amend -m 'fix bug 15 (v2)'
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	208 $ hg push
1475 192bc96d0226 test-sharing: fix globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1451 diff changeset	209 pushing to $TESTTMP/review (glob)
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	210 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	211 adding changesets
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	212 adding manifests
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	213 adding file changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	214 added 1 changesets with 1 changes to 1 files (+1 heads)
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	215 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	216 obsoleted 1 changesets
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	217 updating bookmark bug15
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	218 $ hg -R ../review bookmarks
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	219 bug15 3:cbdfbd5a5db2
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	220
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	221 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	222 $ hg --hidden -R ../review shortlog -G -r 1::
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	223 o 3:cbdfbd5a5db2 draft fix bug 15 (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	224 \|
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	225 \| x 2:f91e97234c2b draft fix bug 15 (v1)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	226 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	227 @ 1:de6151c48e1c public fix bug 37
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	228 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	229 ~
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	230
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	231 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	232 $ cd ../bob
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	233 $ echo 'stuff' > file1
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	234 $ hg bookmark featureX
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	235 $ 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	236 $ hg push -B featureX
1475 192bc96d0226 test-sharing: fix globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1451 diff changeset	237 pushing to $TESTTMP/review (glob)
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	238 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	239 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	240 adding changesets
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	241 adding manifests
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	242 adding file changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	243 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	244 exporting bookmark featureX
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	245 $ hg -R ../review bookmarks
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	246 bug15 3:cbdfbd5a5db2
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	247 featureX 4:193657d1e852
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	248
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	249 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	250 $ echo 'do stuff' > file1
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	251 $ 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	252 $ hg push
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
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	255 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
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)
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	260 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	261 obsoleted 1 changesets
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	262 updating bookmark featureX
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	263
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	264 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	265 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	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 (v3)'
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	268 $ hg push ../public
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	269 pushing to ../public
1259 0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	270 searching for changes
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	271 adding changesets
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	272 adding manifests
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	273 adding file changes
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	274 added 1 changesets with 1 changes to 1 files
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	275 4 new obsolescence markers
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	276 $ hg -R ../public bookmarks
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	277 no bookmarks set
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	278 $ hg push ../review
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	279 pushing to ../review
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	280 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	281 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	282 adding changesets
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	283 adding manifests
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	284 adding file changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	285 added 1 changesets with 1 changes to 1 files (+1 heads)
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	286 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	287 obsoleted 1 changesets
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	288 updating bookmark featureX
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	289 $ hg -R ../review bookmarks
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	290 bug15 3:cbdfbd5a5db2
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	291 featureX 6:540ba8f317e6
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	292
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	293 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	294 $ hg --hidden -R ../review shortlog -G -r 1::
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	295 o 6:540ba8f317e6 public implement feature X (v3)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	296 \|
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	297 \| x 5:0eb74a7b6698 draft implement feature X (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	298 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	299 \| x 4:193657d1e852 draft implement feature X (v1)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	300 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	301 \| o 3:cbdfbd5a5db2 draft fix bug 15 (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	302 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	303 \| x 2:f91e97234c2b draft fix bug 15 (v1)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	304 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	305 @ 1:de6151c48e1c public fix bug 37
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	306 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	307 ~
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	308 $ hg --hidden -R ../public shortlog -G -r 1::
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	309 o 2:540ba8f317e6 public implement feature X (v3)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	310 \|
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	311 o 1:de6151c48e1c public fix bug 37
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	312 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	313 ~
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	314
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	315 How do things look in the review repo?
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	316 $ cd ../review
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	317 $ hg --hidden shortlog -G -r 1::
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	318 o 6:540ba8f317e6 public implement feature X (v3)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	319 \|
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	320 \| x 5:0eb74a7b6698 draft implement feature X (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	321 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	322 \| x 4:193657d1e852 draft implement feature X (v1)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	323 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	324 \| o 3:cbdfbd5a5db2 draft fix bug 15 (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	325 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	326 \| x 2:f91e97234c2b draft fix bug 15 (v1)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	327 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	328 @ 1:de6151c48e1c public fix bug 37
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	329 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	330 ~
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	331
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	332 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	333 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	334 $ cd ../alice
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	335 $ hg --hidden shortlog -G -r 1::
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	336 @ 4:cbdfbd5a5db2 draft fix bug 15 (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	337 \|
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	338 \| x 3:55dd95168a35 draft temporary amend commit for f91e97234c2b
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	339 \| \|
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	340 \| x 2:f91e97234c2b draft fix bug 15 (v1)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	341 \|/
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	342 o 1:de6151c48e1c public fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	343 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	344 ~
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	345 $ hg outgoing -q ../public
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	346 4:cbdfbd5a5db2
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	347 $ hg push ../public
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	348 pushing to ../public
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	349 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	350 remote has heads on branch 'default' that are not known locally: 540ba8f317e6
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	351 abort: push creates new remote head cbdfbd5a5db2 with bookmark 'bug15'!
1737 5383671ef612 evolve: fix test breaks related to double->single quote changes Kostia Balytskyi <ikostia@fb.com> parents: 1641 diff changeset	352 (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	353 [255]
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	354 $ hg pull ../public
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	355 pulling from ../public
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	356 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	357 adding changesets
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	358 adding manifests
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	359 adding file changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	360 added 1 changesets with 1 changes to 1 files (+1 heads)
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	361 4 new obsolescence markers
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	362 (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	363 $ hg log -G -q -r 'head()'
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	364 o 5:540ba8f317e6
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	365 \|
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 @ 4:cbdfbd5a5db2
27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	368 \|
27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	369 ~
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	370 $ hg --hidden shortlog -G -r 1::
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	371 o 5:540ba8f317e6 public implement feature X (v3)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	372 \|
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	373 \| @ 4:cbdfbd5a5db2 draft fix bug 15 (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	374 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	375 \| x 3:55dd95168a35 draft temporary amend commit for f91e97234c2b
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	376 \| \|
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	377 \| x 2:f91e97234c2b draft fix bug 15 (v1)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	378 \|/
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	379 o 1:de6151c48e1c public fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	380 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	381 ~
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	382
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	383 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	384 publishes the result.
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	385 $ hg rebase -d 5
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	386 rebasing 4:cbdfbd5a5db2 "fix bug 15 (v2)" (bug15)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	387 $ hg push ../public
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	388 pushing to ../public
1259 0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	389 searching for changes
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	390 adding changesets
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	391 adding manifests
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	392 adding file changes
0daf56a2032d docs: update sharing guide based (mostly) on marmoute's review Greg Ward <greg@gerg.ca> parents: 1130 diff changeset	393 added 1 changesets with 1 changes to 1 files
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	394 3 new obsolescence markers
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	395 $ hg push ../review
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	396 pushing to ../review
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	397 searching for changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	398 adding changesets
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	399 adding manifests
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	400 adding file changes
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	401 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	402 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	403 obsoleted 1 changesets
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	404 updating bookmark bug15
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	405
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	406 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	407 $ hg --hidden -R ../review shortlog -G -r 1::
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	408 o 7:a06ec1bf97bd public fix bug 15 (v2)
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	409 \|
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	410 o 6:540ba8f317e6 public implement feature X (v3)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	411 \|
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	412 \| x 5:0eb74a7b6698 draft implement feature X (v2)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	413 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	414 \| x 4:193657d1e852 draft implement feature X (v1)
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	415 \|/
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	416 \| x 3:cbdfbd5a5db2 draft fix bug 15 (v2)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	417 \|/
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	418 \| x 2:f91e97234c2b draft fix bug 15 (v1)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	419 \|/
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	420 @ 1:de6151c48e1c public fix bug 37
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	421 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	422 ~
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	423 $ hg --hidden -R ../public shortlog -G -r 1::
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	424 o 3:a06ec1bf97bd public fix bug 15 (v2)
1261 56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	425 \|
56cc2eb5995a docs: add code review scenario to sharing guide Greg Ward <greg@gerg.ca> parents: 1259 diff changeset	426 o 2:540ba8f317e6 public implement feature X (v3)
979 c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	427 \|
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	428 o 1:de6151c48e1c public fix bug 37
c7b2ccd99dab docs: add guide to sharing mutable history Greg Ward <greg@gerg.ca> parents: diff changeset	429 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	430 ~
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	431 $ cd ..
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	432
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	433 Setup for "cowboy mode" shared mutable history (to illustrate divergent
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	434 and bumped changesets).
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	435 $ 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	436 $ 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	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 $ 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	440 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	441 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	442 $ 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	443 > [phases]
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	444 > publish = false
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	445 > EOF
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	446 $ 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	447
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	448 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	449
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	450 $ cd bob
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	451 $ 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	452 $ 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	453 $ hg shortlog -r .
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	454 4:2fe6c4bd32d0 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	455
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	456 Since Alice and Bob are now in cowboy mode, Alice pulls Bob's draft
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	457 changeset and amends it herself. ::
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	458
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	459 $ cd ../alice
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	460 $ 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	461 pulling from ../bob
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	462 searching for changes
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	463 adding changesets
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	464 adding manifests
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	465 adding file changes
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	466 added 1 changesets with 1 changes to 1 files
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	467 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	468 $ 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	469 $ 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	470
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	471 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	472
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	473 $ cd ../bob
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	474 $ 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	475 $ 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	476 $ hg --hidden shortlog -G -r 3::
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	477 @ 6:a360947f6faf 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	478 \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	479 \| x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	480 \| \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	481 \| x 4:2fe6c4bd32d0 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	482 \|/
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	483 o 3:a06ec1bf97bd 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	484 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	485 ~
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	486
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	487 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	488 $ hg pull ../alice
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	489 pulling from ../alice
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	490 searching for changes
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	491 adding changesets
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	492 adding manifests
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	493 adding file changes
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	494 added 1 changesets with 1 changes to 1 files (+1 heads)
1453 8ca31deb8db7 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 1451 diff changeset	495 2 new obsolescence markers
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	496 (run 'hg heads' to see heads, 'hg merge' to merge)
2856 f6517779a7c4 warning: rename warning message Boris Feld <boris.feld@octobus.net> parents: 2843 diff changeset	497 2 new contentdivergent changesets
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	498
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	499 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	500 $ hg --hidden shortlog -G -r 3::
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	501 o 7:e3f99ce9d9cd 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	502 \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	503 \| @ 6:a360947f6faf 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	504 \|/
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	505 \| x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	506 \| \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	507 \| x 4:2fe6c4bd32d0 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	508 \|/
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	509 o 3:a06ec1bf97bd 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	510 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	511 ~
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	512 $ hg --hidden shortlog -r 'successors(2fe6)'
edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	513 6:a360947f6faf draft fix bug 24 (v2 by bob)
edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	514 7:e3f99ce9d9cd 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	515
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	516 Use evolve to fix the divergence.
2835 20c2499ce8bc log: divergent was renamed into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 2787 diff changeset	517 $ HGMERGE=internal:other hg evolve --contentdivergent
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	518 merge:[6] 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	519 with: [7] 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	520 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	521 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	522 working directory is now at 5ad6037c046c
2843 f588de9dd067 revset: divergent() is deprecated Boris Feld <boris.feld@octobus.net> parents: 2835 diff changeset	523 $ 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	524
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	525 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	526 $ hg --hidden shortlog -G -r 3::
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	527 @ 9:5ad6037c046c 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	528 \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	529 \| x 8:bcfc9a755ac3 draft temporary amend commit for a360947f6faf
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	530 \| \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	531 +---x 7:e3f99ce9d9cd 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	532 \| \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	533 \| x 6:a360947f6faf 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	534 \|/
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	535 \| x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	536 \| \|
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	537 \| x 4:2fe6c4bd32d0 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	538 \|/
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	539 o 3:a06ec1bf97bd 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	540 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1616 diff changeset	541 ~
1265 14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	542 $ hg --hidden shortlog -r 'precursors(9)'
1595 edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	543 6:a360947f6faf draft fix bug 24 (v2 by bob)
edcd2f0474c8 test: back hash change from 'extra' content change out Pierre-Yves David <pierre-yves.david@fb.com> parents: 1544 diff changeset	544 7:e3f99ce9d9cd 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	545 $ cat file1
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	546 Do stuff.
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	547 pretty good fix
14f91037d2f6 docs: revive the explanation of divergent changesets in the sharing guide Greg Ward <greg@gerg.ca> parents: 1263 diff changeset	548 better fix (alice)

Mercurial > evolve

annotate tests/test-sharing.t @ 2856:f6517779a7c4