evolve: tests/test-userguide.t annotate

annotate tests/test-userguide.t @ 2929:06844693bb21

tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.

author	Boris Feld <boris.feld@octobus.net>
date	Fri, 15 Sep 2017 15:48:18 +0200
parents	66796d7b5415
children

rev	line source
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	1 ensure that all the scenarios in the user guide work as documented
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	2
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	3 basic repo
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	4 $ hg init t
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	5 $ cd t
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	6 $ touch file1.c file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	7 $ hg -q commit -A -m init
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	8
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	9 example 1: commit creates a changeset in draft phase
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	10 (this is nothing to do with evolve, but it's mentioned in the user guide)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	11 $ echo 'feature Y' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	12 $ hg commit -u alice -d '0 0' -m 'implement feature X'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	13 $ hg phase -r .
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	14 1: draft
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	15 $ hg identify -in
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	16 6e725fd2be6f 1
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	17
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	18 example 2: unsafe amend with plain vanilla Mercurial: the original
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	19 commit is stripped
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	20 $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
2723 c8ba73642143 test: handle output change in 20f533a92eda Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2290 diff changeset	21 saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	22 $ hg log -r 23fe4ac6d3f1
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	23 abort: unknown revision '23fe4ac6d3f1'!
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	24 [255]
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	25 $ hg identify -in
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	26 fe0ecd3bd2a4 1
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	27
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	28 enable evolve for safe history modification
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	29 $ cat >> $HGRCPATH <<EOF
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	30 > [alias]
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	31 > shortlog = log --template '{rev}:{node\|short} {phase} {desc\|firstline}\n'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	32 > [extensions]
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	33 > rebase =
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	34 > EOF
1806 9f42f819267b evolve: move the extensions to 'hgext3rd' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1781 diff changeset	35 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	36
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	37 example 3: safe amend with "hg commit --amend" (figure 2)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	38 $ echo 'tweak feature Y' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	39 $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	40 $ hg shortlog -q -r fe0ecd3bd2a4
1133 8b3b0549a4b6 test: adapt to new hidden-changeset message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1110 diff changeset	41 abort: hidden revision 'fe0ecd3bd2a4'!
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 1806 diff changeset	42 (use --hidden to access hidden revisions; successor: 934359450037)
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	43 [255]
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	44 $ hg --hidden shortlog -G
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	45 @ 2:934359450037 draft implement feature Y
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	46 \|
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	47 \| x 1:fe0ecd3bd2a4 draft implement feature Y
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	48 \|/
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	49 o 0:08c4b6f4efc8 draft init
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	50
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	51 example 3 redux: repeat safe amend, this time with "hg amend"
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	52 $ hg rollback -q
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	53 $ hg amend -u alice -d '2 0' -m 'implement feature Y'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	54 $ hg --hidden shortlog -G
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	55 @ 2:934359450037 draft implement feature Y
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	56 \|
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	57 \| x 1:fe0ecd3bd2a4 draft implement feature Y
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	58 \|/
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	59 o 0:08c4b6f4efc8 draft init
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	60
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	61 example 4: prune at head (figure 3)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	62 $ echo 'debug hack' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	63 $ hg commit -m 'debug hack'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	64 $ hg prune .
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	65 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	66 working directory now at 934359450037
1239 8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1195 diff changeset	67 1 changesets pruned
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	68 $ hg parents --template '{rev}:{node\|short} {desc\|firstline}\n'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	69 2:934359450037 implement feature Y
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	70 $ hg --hidden shortlog -G -r 934359450037:
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	71 x 3:a3e0ef24aaf0 draft debug hack
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	72 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	73 @ 2:934359450037 draft implement feature Y
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	74 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	75 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	76
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	77 example 5: uncommit files at head (figure 4)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	78 $ echo 'relevant' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	79 $ echo 'irrelevant' >> file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	80 $ hg commit -u dan -d '10 0' -m 'fix bug 234'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	81 $ hg uncommit file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	82 $ hg status
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	83 M file2.c
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	84 $ hg --hidden shortlog -G -r 'descendants(934359450037) - a3e0ef24aaf0'
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	85 @ 5:c8defeecf7a4 draft fix bug 234
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	86 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	87 \| x 4:da4331967f5f draft fix bug 234
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	88 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	89 o 2:934359450037 draft implement feature Y
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	90 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	91 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	92 $ hg parents --template '{rev}:{node\|short} {desc\|firstline}\n{files}\n'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	93 5:c8defeecf7a4 fix bug 234
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	94 file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	95 $ hg revert --no-backup file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	96
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	97 example 6: fold multiple changesets together into one (figure 5)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	98 $ echo step1 >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	99 $ hg commit -m 'step 1'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	100 $ echo step2 >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	101 $ hg commit -m 'step 2'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	102 $ echo step3 >> file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	103 $ hg commit -m 'step 3'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	104 $ hg log --template '{rev}:{node\|short} {desc\|firstline}\n' -r 05e61aab8294::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	105 6:05e61aab8294 step 1
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	106 7:be6d5bc8e4cc step 2
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	107 8:35f432d9f7c1 step 3
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	108 $ hg fold -d '0 0' -m 'fix bug 64' --from -r 05e61aab8294::
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	109 3 changesets folded
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	110 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	111 $ hg --hidden shortlog -G -r c8defeecf7a4::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	112 @ 9:171c6a79a27b draft fix bug 64
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	113 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	114 \| x 8:35f432d9f7c1 draft step 3
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	115 \| \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	116 \| x 7:be6d5bc8e4cc draft step 2
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	117 \| \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	118 \| x 6:05e61aab8294 draft step 1
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	119 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	120 o 5:c8defeecf7a4 draft fix bug 234
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	121 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	122 ~
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	123 $ hg --hidden log -q -r 'successors(05e61aab8294) \| successors(be6d5bc8e4cc) \| successors(35f432d9f7c1)'
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	124 9:171c6a79a27b
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	125 $ hg --hidden log -q -r 'precursors(171c6a79a27b)'
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	126 6:05e61aab8294
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	127 7:be6d5bc8e4cc
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	128 8:35f432d9f7c1
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	129 $ hg diff -c 171c6a79a27b -U 0
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	130 diff -r c8defeecf7a4 -r 171c6a79a27b file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	131 --- a/file1.c Thu Jan 01 00:00:10 1970 +0000
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	132 +++ b/file1.c Thu Jan 01 00:00:00 1970 +0000
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	133 @@ -3,0 +4,2 @@
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	134 +step1
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	135 +step2
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	136 diff -r c8defeecf7a4 -r 171c6a79a27b file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	137 --- a/file2.c Thu Jan 01 00:00:10 1970 +0000
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	138 +++ b/file2.c Thu Jan 01 00:00:00 1970 +0000
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	139 @@ -0,0 +1,1 @@
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	140 +step3
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	141
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	142 setup for example 7: amend an older changeset
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	143 $ echo 'fix fix oops fix' > file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	144 $ hg commit -u bob -d '3 0' -m 'fix bug 17'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	145 $ echo 'cleanup' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	146 $ hg commit -u bob -d '4 0' -m 'cleanup'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	147 $ echo 'new feature' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	148 $ hg commit -u bob -d '5 0' -m 'feature 23'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	149 $ hg --hidden shortlog -G -r 171c6a79a27b::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	150 @ 12:dadcbba2d606 draft feature 23
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	151 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	152 o 11:debd46bb29dc draft cleanup
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	153 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	154 o 10:3e1cb8f70c02 draft fix bug 17
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	155 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	156 o 9:171c6a79a27b draft fix bug 64
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	157 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	158 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	159
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	160 example 7: amend an older changeset (figures 6, 7)
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	161 $ hg update -q -r 3e1cb8f70c02
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	162 $ echo 'fix fix fix fix' > file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	163 $ hg amend -u bob -d '6 0'
2854 66796d7b5415 warning: rename unstable warning message Boris Feld <boris.feld@octobus.net> parents: 2842 diff changeset	164 2 new orphan changesets
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	165 $ hg shortlog -r 'obsolete()'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	166 10:3e1cb8f70c02 draft fix bug 17
2842 2b8b960a04ee revset: unstable() is deprecated Boris Feld <boris.feld@octobus.net> parents: 2723 diff changeset	167 $ hg shortlog -r "orphan()"
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	168 11:debd46bb29dc draft cleanup
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	169 12:dadcbba2d606 draft feature 23
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	170 $ hg --hidden shortlog -G -r 171c6a79a27b::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	171 @ 13:395cbeda3a06 draft fix bug 17
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	172 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	173 \| o 12:dadcbba2d606 draft feature 23
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	174 \| \|
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	175 \| o 11:debd46bb29dc draft cleanup
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	176 \| \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	177 \| x 10:3e1cb8f70c02 draft fix bug 17
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	178 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	179 o 9:171c6a79a27b draft fix bug 64
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	180 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	181 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	182 $ hg evolve -q --all
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	183 $ hg shortlog -G -r 171c6a79a27b::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	184 @ 15:91b4b0f8b5c5 draft feature 23
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	185 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	186 o 14:fe8858bd9bc2 draft cleanup
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	187 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	188 o 13:395cbeda3a06 draft fix bug 17
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	189 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	190 o 9:171c6a79a27b draft fix bug 64
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	191 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	192 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	193
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	194 setup for example 8: prune an older changeset (figure 8)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	195 $ echo 'useful' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	196 $ hg commit -u carl -d '7 0' -m 'useful work'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	197 $ echo 'debug' >> file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	198 $ hg commit -u carl -d '8 0' -m 'debug hack'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	199 $ echo 'more useful' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	200 $ hg commit -u carl -d '9 0' -m 'more work'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	201 $ hg shortlog -G -r 91b4b0f8b5c5::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	202 @ 18:ea8fafca914b draft more work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	203 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	204 o 17:b23d06b457a8 draft debug hack
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	205 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	206 o 16:1f33e68b18b9 draft useful work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	207 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	208 o 15:91b4b0f8b5c5 draft feature 23
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	209 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	210 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	211
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	212 example 8: prune an older changeset (figures 8, 9)
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	213 $ hg prune b23d06b457a8
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	214 1 changesets pruned
2854 66796d7b5415 warning: rename unstable warning message Boris Feld <boris.feld@octobus.net> parents: 2842 diff changeset	215 1 new orphan changesets
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	216 $ hg --hidden shortlog -G -r b23d06b457a8::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	217 @ 18:ea8fafca914b draft more work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	218 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	219 x 17:b23d06b457a8 draft debug hack
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	220 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	221 ~
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1239 diff changeset	222 $ hg evolve -q --all --any
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	223 $ hg --hidden shortlog -G -r 1f33e68b18b9::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	224 @ 19:4393e5877437 draft more work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	225 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	226 \| x 18:ea8fafca914b draft more work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	227 \| \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	228 \| x 17:b23d06b457a8 draft debug hack
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	229 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	230 o 16:1f33e68b18b9 draft useful work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	231 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	232 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	233
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	234 example 9: uncommit files from an older changeset (discard changes)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	235 (figure 10)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	236 $ echo 'this fixes bug 53' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	237 $ echo 'debug hack' >> file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	238 $ hg commit -u dan -d '11 0' -m 'fix bug 53'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	239 $ echo 'and this handles bug 67' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	240 $ hg commit -u dan -d '12 0' -m 'fix bug 67'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	241 $ hg update -r f84357446753
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	243 $ hg shortlog -G -r 4393e5877437::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	244 o 21:4db2428c8ae3 draft fix bug 67
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	245 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	246 @ 20:f84357446753 draft fix bug 53
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	247 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	248 o 19:4393e5877437 draft more work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	249 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	250 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	251 $ hg uncommit file2.c
2854 66796d7b5415 warning: rename unstable warning message Boris Feld <boris.feld@octobus.net> parents: 2842 diff changeset	252 1 new orphan changesets
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	253 $ hg status
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	254 M file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	255 $ hg revert file2.c
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1239 diff changeset	256 $ hg evolve --all --any
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	257 move:[21] fix bug 67
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	258 atop:[22] fix bug 53
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 978 diff changeset	259 working directory is now at 0d972d6888e6
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	260 $ hg --hidden shortlog -G -r 4393e5877437::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	261 @ 23:0d972d6888e6 draft fix bug 67
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	262 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	263 o 22:71bb83d674c5 draft fix bug 53
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	264 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	265 \| x 21:4db2428c8ae3 draft fix bug 67
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	266 \| \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	267 \| x 20:f84357446753 draft fix bug 53
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	268 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	269 o 19:4393e5877437 draft more work
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	270 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	271 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	272 $ rm file2.c.orig
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	273
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	274 example 10: uncommit files from an older changeset (keep changes)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	275 (figures 11, 12)
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	276 $ echo 'fix a bug' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	277 $ echo 'useful but unrelated' >> file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	278 $ hg commit -u dan -d '11 0' -m 'fix a bug'
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	279 $ echo 'new feature' >> file1.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	280 $ hg commit -u dan -d '12 0' -m 'new feature'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	281 $ hg update 5b31a1239ab9
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	282 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	283 $ hg --hidden shortlog -G -r 0d972d6888e6::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	284 o 25:fbb3c6d50427 draft new feature
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	285 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	286 @ 24:5b31a1239ab9 draft fix a bug
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	287 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	288 o 23:0d972d6888e6 draft fix bug 67
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	289 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	290 ~
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	291 $ hg uncommit file2.c
2854 66796d7b5415 warning: rename unstable warning message Boris Feld <boris.feld@octobus.net> parents: 2842 diff changeset	292 1 new orphan changesets
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	293 $ hg status
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	294 M file2.c
8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	295 $ hg commit -m 'useful tweak'
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	296 $ hg --hidden shortlog -G -r 0d972d6888e6::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	297 @ 27:51e0d8c0a922 draft useful tweak
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	298 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	299 o 26:2594e98553a9 draft fix a bug
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	300 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	301 \| o 25:fbb3c6d50427 draft new feature
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	302 \| \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	303 \| x 24:5b31a1239ab9 draft fix a bug
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	304 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	305 o 23:0d972d6888e6 draft fix bug 67
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	306 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	307 ~
1422 c868a69c29c5 evolve: distinct between '--all' and '--all --any' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1239 diff changeset	308 $ hg evolve --all --any
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	309 move:[25] new feature
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	310 atop:[26] fix a bug
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 978 diff changeset	311 working directory is now at 166c1c368ab6
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	312 $ hg --hidden shortlog -G -r 0d972d6888e6::
06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	313 @ 28:166c1c368ab6 draft new feature
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	314 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	315 \| o 27:51e0d8c0a922 draft useful tweak
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	316 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	317 o 26:2594e98553a9 draft fix a bug
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	318 \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	319 \| x 25:fbb3c6d50427 draft new feature
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	320 \| \|
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	321 \| x 24:5b31a1239ab9 draft fix a bug
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	322 \|/
2929 06844693bb21 tests: update after removing of redundant amend commit Boris Feld <boris.feld@octobus.net> parents: 2854 diff changeset	323 o 23:0d972d6888e6 draft fix bug 67
978 8328337d23b2 docs: add new user guide Greg Ward <greg@gerg.ca> parents: diff changeset	324 \|
1641 27445da063b7 tests: adapt output to the new graphlog style Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1422 diff changeset	325 ~

Mercurial > evolve

annotate tests/test-userguide.t @ 2929:06844693bb21