mercurial-source: tests/test-histedit-fold.t annotate

annotate tests/test-histedit-fold.t @ 19017:c5c8613f265e

histedit: properly handle --continue on empty fold When all changes from the fold have been dropped, the --continue code was confused. This changeset handles this case. The test for this case existed but was broken.

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Tue, 16 Apr 2013 16:58:25 +0200
parents	27ec54f2946e
children	730614b9b352

rev	line source
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	1 Test histedit extention: Fold commands
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	2 ======================================
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	3
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	4 This test file is dedicated to testing the fold command in non conflicting
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	5 case.
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	6
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	7 Initialization
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	8 ---------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	9
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	10
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	11 $ . "$TESTDIR/histedit-helpers.sh"
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	12
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	13 $ cat >> $HGRCPATH <<EOF
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	14 > [alias]
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	15 > logt = log --template '{rev}:{node\|short} {desc\|firstline}\n'
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	16 > [extensions]
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	17 > graphlog=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	18 > histedit=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	19 > EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	20
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	21
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	22 Simple folding
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	23 --------------------
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	24 $ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	25 > {
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	26 > hg init r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	27 > cd r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	28 > for x in a b c d e f ; do
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	29 > echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	30 > hg add $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	31 > hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	32 > done
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	33 > }
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	34
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	35 $ initrepo
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	36
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	37 log before edit
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	38 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	39 @ 5:652413bf663e f
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	40 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	41 o 4:e860deea161a e
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	42 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	43 o 3:055a42cdd887 d
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	44 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	45 o 2:177f92b77385 c
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	46 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	47 o 1:d2ae7f538514 b
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	48 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	49 o 0:cb9a9f314b8b a
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	50
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	51
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	52 $ EDITED="$TESTTMP/editedhistory"
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	53 $ cat > $EDITED <<EOF
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	54 > pick e860deea161a e
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	55 > pick 652413bf663e f
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	56 > fold 177f92b77385 c
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	57 > pick 055a42cdd887 d
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	58 > EOF
17072 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17071 diff changeset	59 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 \| fixbundle
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	60 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	62 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	63 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	64 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	65 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	66 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	67
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	68 log after edit
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	69 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	70 @ 4:7e0a290363ed d
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	71 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	72 o 3:5e24935bad3d pick e860deea161a e
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	73 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	74 o 2:ee283cb5f2d5 e
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	75 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	76 o 1:d2ae7f538514 b
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	77 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	78 o 0:cb9a9f314b8b a
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	79
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	80
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	81 post-fold manifest
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	82 $ hg manifest
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	83 a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	84 b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	85 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	86 d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	87 e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	88 f
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	89
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	90
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	91 check histedit_source
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	92
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	93 $ hg log --debug --rev 3
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	94 changeset: 3:5e24935bad3d5a4486de3b90f233e991465ced72
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	95 phase: draft
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	96 parent: 2:ee283cb5f2d5955443f23a27b697a04339e9a39a
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	97 parent: -1:0000000000000000000000000000000000000000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	98 manifest: 3:81eede616954057198ead0b2c73b41d1f392829a
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	99 user: test
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	100 date: Thu Jan 01 00:00:00 1970 +0000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	101 files+: c f
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	102 extra: branch=default
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	103 extra: histedit_source=a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3,177f92b773850b59254aa5e923436f921b55483b
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	104 description:
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	105 pick e860deea161a e
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	106 pick 652413bf663e f
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	107 fold 177f92b77385 c
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	108 pick 055a42cdd887 d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	109
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	110
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	111
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	112 $ cd ..
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	113
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	114 folding and creating no new change doesn't break:
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	115 -------------------------------------------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	116
19016 27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	117 folded content is dropped during a merge. The folded commit should properly disapear.
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	118
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	119 $ mkdir fold-to-empty-test
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	120 $ cd fold-to-empty-test
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	121 $ hg init
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	122 $ printf "1\n2\n3\n" > file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	123 $ hg add file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	124 $ hg commit -m '1+2+3'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	125 $ echo 4 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	126 $ hg commit -m '+4'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	127 $ echo 5 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	128 $ hg commit -m '+5'
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	129 $ echo 6 >> file
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	130 $ hg commit -m '+6'
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	131 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	132 @ 3:251d831eeec5 +6
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	133 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	134 o 2:888f9082bf99 +5
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	135 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	136 o 1:617f94f13c0f +4
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	137 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	138 o 0:0189ba417d34 1+2+3
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	139
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	140
19016 27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	141 $ cat > $EDITED <<EOF
27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	142 > pick 617f94f13c0f 1 +4
27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	143 > drop 888f9082bf99 2 +5
19017 c5c8613f265e histedit: properly handle --continue on empty fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19016 diff changeset	144 > fold 251d831eeec5 3 +6
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	145 > EOF
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	146
19016 27ec54f2946e histedit-test: replace obscure python script by a plain file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19015 diff changeset	147 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 1
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	149 merging file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	150 warning: conflicts during merge.
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	151 merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
18934 93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 18642 diff changeset	152 Fix up the change and run hg histedit --continue
18935 e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc) Augie Fackler <raf@durin42.com> parents: 18934 diff changeset	153 [1]
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	154 There were conflicts, we keep P1 content. This
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	155 should effectively drop the changes from +6.
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	156 $ hg status
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	157 M file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	158 ? file.orig
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	159 $ hg resolve -l
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	160 U file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	161 $ hg revert -r 'p1()' file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	162 $ hg resolve --mark file
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	163 $ hg histedit --continue
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	164 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	165 saved backup bundle to $TESTTMP/*-backup.hg (glob)
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	166 $ hg logt --graph
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	167 @ 1:617f94f13c0f +4
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	168 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	169 o 0:0189ba417d34 1+2+3
17137 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	170
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	171
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17073 diff changeset	172 $ cd ..
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	173
19015 07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	174
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	175 Test fold through dropped
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	176 -------------------------
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	177
07db88f053fe test: improve documentation of some histedit tests Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19014 diff changeset	178
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	179 Test corner case where folded revision is separated from its parent by a
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	180 dropped revision.
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	181
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	182
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	183 $ hg init fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	184 $ cd fold-with-dropped
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	185 $ printf "1\n2\n3\n" > file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	186 $ hg commit -Am '1+2+3'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	187 adding file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	188 $ echo 4 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	189 $ hg commit -m '+4'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	190 $ echo 5 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	191 $ hg commit -m '+5'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	192 $ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	193 $ hg commit -m '+6'
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	194 $ hg logt -G --template '{rev}:{node\|short} {desc\|firstline}\n'
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	195 @ 3:251d831eeec5 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	196 \|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	197 o 2:888f9082bf99 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	198 \|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	199 o 1:617f94f13c0f +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	200 \|
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	201 o 0:0189ba417d34 1+2+3
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	202
17258 d9626b91623a test-histedit-fold: fix for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 17242 diff changeset	203 $ EDITED="$TESTTMP/editcommands"
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	204 $ cat > $EDITED <<EOF
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	205 > pick 617f94f13c0f 1 +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	206 > drop 888f9082bf99 2 +5
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	207 > fold 251d831eeec5 3 +6
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	208 > EOF
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	209 $ HGEDITOR="cat $EDITED >" hg histedit 1
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	210 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	211 merging file
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	212 warning: conflicts during merge.
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	213 merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
18934 93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 18642 diff changeset	214 Fix up the change and run hg histedit --continue
18935 e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc) Augie Fackler <raf@durin42.com> parents: 18934 diff changeset	215 [1]
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	216 $ cat > file << EOF
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	217 > 1
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	218 > 2
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	219 > 3
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	220 > 4
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	221 > 5
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	222 > EOF
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17644 diff changeset	223 $ hg resolve --mark file
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	224 $ hg commit -m '+5.2'
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	225 created new head
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	226 $ echo 6 >> file
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	227 $ HGEDITOR=cat hg histedit --continue
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	228 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	229 +4
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	230 ***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	231 +5.2
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	232 ***
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	233 +6
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	234
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	235
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	236
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	237 HG: Enter commit message. Lines beginning with 'HG:' are removed.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	238 HG: Leave message empty to abort commit.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	239 HG: --
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	240 HG: user: test
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	241 HG: branch 'default'
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	242 HG: changed file
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17258 diff changeset	243 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	244 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	245 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	246 $ hg logt -G
7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	247 @ 1:10c647b2cdd5 +4
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	248 \|
19014 7b50120e8f6e test: use a lighter log style in histedit test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18935 diff changeset	249 o 0:0189ba417d34 1+2+3
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	250
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	251 $ hg export tip
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	252 # HG changeset patch
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	253 # User test
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	254 # Date 0 0
18642 76b69cccb07a export: show 'Date' header in a format that also is readable for humans Mads Kiilerich <mads@kiilerich.com> parents: 18437 diff changeset	255 # Thu Jan 01 00:00:00 1970 +0000
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	256 # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	257 # Parent 0189ba417d34df9dda55f88b637dcae9917b5964
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	258 +4
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	259 ***
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	260 +5.2
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	261 ***
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	262 +6
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	263
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17686 diff changeset	264 diff -r 0189ba417d34 -r 10c647b2cdd5 file
17686 8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	265 --- a/file Thu Jan 01 00:00:00 1970 +0000
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	266 +++ b/file Thu Jan 01 00:00:00 1970 +0000
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	267 @@ -1,3 +1,6 @@
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	268 1
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	269 2
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	270 3
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	271 +4
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	272 +5
8853f37b1e62 histedit-test: make test-fold more verbose Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17647 diff changeset	273 +6
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	274 $ cd ..
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17137 diff changeset	275

Mercurial > hg > mercurial-source

annotate tests/test-histedit-fold.t @ 19017:c5c8613f265e