mercurial: tests/test-commit-amend.t@41263df08109 (annotated)

16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	1	$ hg init
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	2
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	3	Setup:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	4
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	5	$ echo a >> a
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	6	$ hg ci -Am 'base'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	7	adding a
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	8
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	9	Refuse to amend public csets:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	10
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	11	$ hg phase -r . -p
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	12	$ hg ci --amend
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	13	abort: cannot amend public changesets
35244 98f97eb20597 rewriteutil: use precheck() in uncommit and amend commands Pulkit Goyal <7895pulkit@gmail.com> parents: 34867 diff changeset	14	(see 'hg help phases' for details)
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	15	[255]
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	16	$ hg phase -r . -f -d
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	17
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	18	$ echo a >> a
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	19	$ hg ci -Am 'base1'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	20
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	21	Nothing to amend:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	22
26750 9f9ec4abe700 cmdutil: make in-memory changes visible to external editor (issue4378) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26614 diff changeset	23	$ hg ci --amend -m 'base1'
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	24	nothing changed
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	25	[1]
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	26
17060 69fa0459dd3b test-commit-amend: adapt for Windows after fba17a64fa49 Adrian Buehlmann <adrian@cadifra.com> parents: 17059 diff changeset	27	$ cat >> $HGRCPATH <<EOF
69fa0459dd3b test-commit-amend: adapt for Windows after fba17a64fa49 Adrian Buehlmann <adrian@cadifra.com> parents: 17059 diff changeset	28	> [hooks]
17462 8085fed2bf0a tests: correct quoting of double quotes in here documents used to write hooks Jim Hague <jim.hague@acm.org> parents: 17461 diff changeset	29	> pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE"
17060 69fa0459dd3b test-commit-amend: adapt for Windows after fba17a64fa49 Adrian Buehlmann <adrian@cadifra.com> parents: 17059 diff changeset	30	> EOF
17049 2440822446ce amend: disable hooks when creating intermediate commit (issue3501) Idan Kamara <idankk86@gmail.com> parents: 16630 diff changeset	31
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	32	Amending changeset with changes in working dir:
17924 45bd0cd7ca04 amend: force editor only if old message is reused (issue3698) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17863 diff changeset	33	(and check that --message does not trigger an editor)
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	34
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	35	$ echo a >> a
17924 45bd0cd7ca04 amend: force editor only if old message is reused (issue3698) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17863 diff changeset	36	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	37	pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	38	43f1ba15f28a tip
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	39	saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg
17049 2440822446ce amend: disable hooks when creating intermediate commit (issue3501) Idan Kamara <idankk86@gmail.com> parents: 16630 diff changeset	40	$ echo 'pretxncommit.foo = ' >> $HGRCPATH
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	41	$ hg diff -c .
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	42	diff -r ad120869acf0 -r 43f1ba15f28a a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	43	--- a/a Thu Jan 01 00:00:00 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	44	+++ b/a Thu Jan 01 00:00:00 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	45	@@ -1,1 +1,3 @@
30432 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30431 diff changeset	46	a
30431 8c0c75aa3ff4 bdiff: give slight preference to longest matches in the middle of the B side Mads Kiilerich <madski@unity3d.com> parents: 30240 diff changeset	47	+a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	48	+a
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	49	$ hg log
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	50	changeset: 1:43f1ba15f28a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	51	tag: tip
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	52	user: test
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	53	date: Thu Jan 01 00:00:00 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	54	summary: amend base1
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	55
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	56	changeset: 0:ad120869acf0
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	57	user: test
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	58	date: Thu Jan 01 00:00:00 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	59	summary: base
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	60
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	61
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	62	Check proper abort for empty message
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	63
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	64	$ cat > editor.sh << '__EOF__'
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	65	> #!/bin/sh
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	66	> echo "" > "$1"
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	67	> __EOF__
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	68
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	69	Update the existing file to ensure that the dirstate is not in pending state
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	70	(where the status of some files in the working copy is not known yet). This in
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	71	turn ensures that when the transaction is aborted due to an empty message during
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	72	the amend, there should be no rollback.
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	73	$ echo a >> a
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	74
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	75	$ echo b > b
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	76	$ hg add b
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	77	$ hg summary
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	78	parent: 1:43f1ba15f28a tip
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	79	amend base1
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	80	branch: default
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	81	commit: 1 modified, 1 added, 1 unknown
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	82	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25295 diff changeset	83	phases: 2 draft
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	84	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	85	abort: empty commit message
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	86	[255]
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	87	$ hg summary
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	88	parent: 1:43f1ba15f28a tip
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	89	amend base1
153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	90	branch: default
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	91	commit: 1 modified, 1 added, 1 unknown
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	92	update: (current)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25295 diff changeset	93	phases: 2 draft
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	94
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	95	Add new file along with modified existing file:
18197 153659e86a5f amend: invalidate dirstate in case of failure (issue3670) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	96	$ hg ci --amend -m 'amend base1 new file'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	97	saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	98
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	99	Remove file that was added in amended commit:
17863 034e55bbf7c0 amend: fix incompatibity between logfile and message option (issue3675) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17811 diff changeset	100	(and test logfile option)
17924 45bd0cd7ca04 amend: force editor only if old message is reused (issue3698) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17863 diff changeset	101	(and test that logfile option do not trigger an editor)
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	102
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	103	$ hg rm b
17863 034e55bbf7c0 amend: fix incompatibity between logfile and message option (issue3675) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17811 diff changeset	104	$ echo 'amend base1 remove new file' > ../logfile
17924 45bd0cd7ca04 amend: force editor only if old message is reused (issue3698) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17863 diff changeset	105	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	106	saved backup bundle to $TESTTMP/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	107
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	108	$ hg cat b
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	109	b: no such file in rev 47343646fa3d
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	110	[1]
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	111
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	112	No changes, just a different message:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	113
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	114	$ hg ci -v --amend -m 'no changes, new message'
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	115	amending changeset 47343646fa3d
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	116	copying changeset 47343646fa3d to ad120869acf0
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	117	committing files:
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	118	a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	119	committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	120	committing changelog
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	121	1 changesets found
23748 4ab66de46a96 bundle: when verbose, show what takes up the space in the generated bundle Mads Kiilerich <madski@unity3d.com> parents: 23589 diff changeset	122	uncompressed size of bundle content:
30211 6b0741d6d234 changegroup: skip delta when the underlying revlog do not use them Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30062 diff changeset	123	254 (changelog)
26927 0829ed3b75e1 test: use general delta for 'test-commit-amend.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26750 diff changeset	124	163 (manifests)
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	125	131 a
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	126	saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	127	1 changesets found
23748 4ab66de46a96 bundle: when verbose, show what takes up the space in the generated bundle Mads Kiilerich <madski@unity3d.com> parents: 23589 diff changeset	128	uncompressed size of bundle content:
30211 6b0741d6d234 changegroup: skip delta when the underlying revlog do not use them Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30062 diff changeset	129	250 (changelog)
26927 0829ed3b75e1 test: use general delta for 'test-commit-amend.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26750 diff changeset	130	163 (manifests)
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	131	131 a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	132	adding branch
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	133	adding changesets
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	134	adding manifests
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	135	adding file changes
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	136	added 1 changesets with 1 changes to 1 files
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	137	committed changeset 1:401431e913a1
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	138	$ hg diff -c .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	139	diff -r ad120869acf0 -r 401431e913a1 a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	140	--- a/a Thu Jan 01 00:00:00 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	141	+++ b/a Thu Jan 01 00:00:00 1970 +0000
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	142	@@ -1,1 +1,4 @@
30432 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30431 diff changeset	143	a
30431 8c0c75aa3ff4 bdiff: give slight preference to longest matches in the middle of the B side Mads Kiilerich <madski@unity3d.com> parents: 30240 diff changeset	144	+a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	145	+a
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	146	+a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	147	$ hg log
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	148	changeset: 1:401431e913a1
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	149	tag: tip
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	150	user: test
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	151	date: Thu Jan 01 00:00:00 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	152	summary: no changes, new message
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	153
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	154	changeset: 0:ad120869acf0
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	155	user: test
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	156	date: Thu Jan 01 00:00:00 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	157	summary: base
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	158
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	159
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	160	Disable default date on commit so when -d isn't given, the old date is preserved:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	161
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	162	$ echo '[defaults]' >> $HGRCPATH
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	163	$ echo 'commit=' >> $HGRCPATH
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	164
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	165	Test -u/-d:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	166
22249 f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	167	$ cat > .hg/checkeditform.sh <<EOF
f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	168	> env \| grep HGEDITFORM
f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	169	> true
f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	170	> EOF
f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	171	$ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0'
f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	172	HGEDITFORM=commit.amend.normal
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	173	saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	174	$ echo a >> a
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	175	$ hg ci --amend -u foo -d '1 0'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	176	saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	177	$ hg log -r .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	178	changeset: 1:a9a13940fc03
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	179	tag: tip
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	180	user: foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	181	date: Thu Jan 01 00:00:01 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	182	summary: no changes, new message
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	183
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	184
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	185	Open editor with old commit message if a message isn't given otherwise:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	186
16901 5b89700cce30 tests: consistently use a HGEDITOR pattern that works with msys on windows Mads Kiilerich <mads@kiilerich.com> parents: 16900 diff changeset	187	$ cat > editor.sh << '__EOF__'
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	188	> #!/bin/sh
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	189	> cat $1
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	190	> echo "another precious commit message" > "$1"
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	191	> __EOF__
20771 434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	192
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	193	at first, test saving last-message.txt
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	194
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	195	$ cat > .hg/hgrc << '__EOF__'
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	196	> [hooks]
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	197	> pretxncommit.test-saving-last-message = false
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	198	> __EOF__
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	199
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	200	$ rm -f .hg/last-message.txt
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	201	$ hg commit --amend -v -m "message given from command line"
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	202	amending changeset a9a13940fc03
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	203	copying changeset a9a13940fc03 to ad120869acf0
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	204	committing files:
20771 434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	205	a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	206	committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	207	committing changelog
20771 434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	208	running hook pretxncommit.test-saving-last-message: false
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	209	transaction abort!
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	210	rollback completed
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	211	abort: pretxncommit.test-saving-last-message hook exited with status 1
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	212	[255]
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	213	$ cat .hg/last-message.txt
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	214	message given from command line (no-eol)
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	215
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	216	$ rm -f .hg/last-message.txt
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	217	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	218	amending changeset a9a13940fc03
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	219	copying changeset a9a13940fc03 to ad120869acf0
20771 434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	220	no changes, new message
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	221
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	222
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	223	HG: Enter commit message. Lines beginning with 'HG:' are removed.
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	224	HG: Leave message empty to abort commit.
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	225	HG: --
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	226	HG: user: foo
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	227	HG: branch 'default'
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	228	HG: changed a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	229	committing files:
20771 434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	230	a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	231	committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	232	committing changelog
20771 434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	233	running hook pretxncommit.test-saving-last-message: false
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	234	transaction abort!
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	235	rollback completed
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	236	abort: pretxncommit.test-saving-last-message hook exited with status 1
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	237	[255]
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	238
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	239	$ cat .hg/last-message.txt
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	240	another precious commit message
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	241
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	242	$ cat > .hg/hgrc << '__EOF__'
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	243	> [hooks]
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	244	> pretxncommit.test-saving-last-message =
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	245	> __EOF__
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	246
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	247	then, test editing custom commit message
434619dae569 amend: save commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20700 diff changeset	248
16901 5b89700cce30 tests: consistently use a HGEDITOR pattern that works with msys on windows Mads Kiilerich <mads@kiilerich.com> parents: 16900 diff changeset	249	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	250	amending changeset a9a13940fc03
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	251	copying changeset a9a13940fc03 to ad120869acf0
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	252	no changes, new message
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	253
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	254
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	255	HG: Enter commit message. Lines beginning with 'HG:' are removed.
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	256	HG: Leave message empty to abort commit.
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	257	HG: --
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	258	HG: user: foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	259	HG: branch 'default'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	260	HG: changed a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	261	committing files:
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	262	a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	263	committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	264	committing changelog
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	265	1 changesets found
23748 4ab66de46a96 bundle: when verbose, show what takes up the space in the generated bundle Mads Kiilerich <madski@unity3d.com> parents: 23589 diff changeset	266	uncompressed size of bundle content:
30211 6b0741d6d234 changegroup: skip delta when the underlying revlog do not use them Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30062 diff changeset	267	249 (changelog)
26927 0829ed3b75e1 test: use general delta for 'test-commit-amend.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26750 diff changeset	268	163 (manifests)
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	269	133 a
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	270	saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	271	1 changesets found
23748 4ab66de46a96 bundle: when verbose, show what takes up the space in the generated bundle Mads Kiilerich <madski@unity3d.com> parents: 23589 diff changeset	272	uncompressed size of bundle content:
30211 6b0741d6d234 changegroup: skip delta when the underlying revlog do not use them Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30062 diff changeset	273	257 (changelog)
26927 0829ed3b75e1 test: use general delta for 'test-commit-amend.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26750 diff changeset	274	163 (manifests)
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	275	133 a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	276	adding branch
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	277	adding changesets
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	278	adding manifests
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	279	adding file changes
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	280	added 1 changesets with 1 changes to 1 files
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	281	committed changeset 1:64a124ba1b44
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	282
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	283	Same, but with changes in working dir (different code path):
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	284
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	285	$ echo a >> a
16901 5b89700cce30 tests: consistently use a HGEDITOR pattern that works with msys on windows Mads Kiilerich <mads@kiilerich.com> parents: 16900 diff changeset	286	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	287	amending changeset 64a124ba1b44
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	288	another precious commit message
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	289
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	290
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	291	HG: Enter commit message. Lines beginning with 'HG:' are removed.
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	292	HG: Leave message empty to abort commit.
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	293	HG: --
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	294	HG: user: foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	295	HG: branch 'default'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	296	HG: changed a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	297	committing files:
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	298	a
23749 a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	299	committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames Mads Kiilerich <madski@unity3d.com> parents: 23748 diff changeset	300	committing changelog
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	301	1 changesets found
23748 4ab66de46a96 bundle: when verbose, show what takes up the space in the generated bundle Mads Kiilerich <madski@unity3d.com> parents: 23589 diff changeset	302	uncompressed size of bundle content:
30211 6b0741d6d234 changegroup: skip delta when the underlying revlog do not use them Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30062 diff changeset	303	257 (changelog)
26927 0829ed3b75e1 test: use general delta for 'test-commit-amend.t' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26750 diff changeset	304	163 (manifests)
30432 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30431 diff changeset	305	133 a
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	306	saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	307	1 changesets found
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	308	uncompressed size of bundle content:
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	309	257 (changelog)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	310	163 (manifests)
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	311	135 a
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	312	adding branch
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	313	adding changesets
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	314	adding manifests
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	315	adding file changes
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	316	added 1 changesets with 1 changes to 1 files
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	317	committed changeset 1:7892795b8e38
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	318
16901 5b89700cce30 tests: consistently use a HGEDITOR pattern that works with msys on windows Mads Kiilerich <mads@kiilerich.com> parents: 16900 diff changeset	319	$ rm editor.sh
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	320	$ hg log -r .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	321	changeset: 1:7892795b8e38
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	322	tag: tip
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	323	user: foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	324	date: Thu Jan 01 00:00:01 1970 +0000
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	325	summary: another precious commit message
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	326
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	327
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	328	Moving bookmarks, preserve active bookmark:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	329
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	330	$ hg book book1
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	331	$ hg book book2
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	332	$ hg ci --amend -m 'move bookmarks'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	333	saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	334	$ hg book
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	335	book1 1:8311f17e2616
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	336	* book2 1:8311f17e2616
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	337	$ echo a >> a
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	338	$ hg ci --amend -m 'move bookmarks'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	339	saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	340	$ hg book
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	341	book1 1:a3b65065808c
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	342	* book2 1:a3b65065808c
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	343
18198 9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	344	abort does not loose bookmarks
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	345
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	346	$ cat > editor.sh << '__EOF__'
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	347	> #!/bin/sh
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	348	> echo "" > "$1"
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	349	> __EOF__
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	350	$ echo a >> a
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	351	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	352	abort: empty commit message
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	353	[255]
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	354	$ hg book
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	355	book1 1:a3b65065808c
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	356	* book2 1:a3b65065808c
18198 9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	357	$ hg revert -Caq
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	358	$ rm editor.sh
9b4adaef0db9 amend: prevent loss of bookmark on failed amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18197 diff changeset	359
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	360	$ echo '[defaults]' >> $HGRCPATH
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	361	$ echo "commit=-d '0 0'" >> $HGRCPATH
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	362
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	363	Moving branches:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	364
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	365	$ hg branch foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	366	marked working directory as branch foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	367	(branches are permanent and global, did you want a bookmark?)
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	368	$ echo a >> a
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	369	$ hg ci -m 'branch foo'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	370	$ hg branch default -f
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	371	marked working directory as branch default
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	372	$ hg ci --amend -m 'back to default'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	373	saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	374	$ hg branches
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	375	default 2:9c07515f2650
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	376
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	377	Close branch:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	378
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	379	$ hg up -q 0
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	380	$ echo b >> b
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	381	$ hg branch foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	382	marked working directory as branch foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	383	(branches are permanent and global, did you want a bookmark?)
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	384	$ hg ci -Am 'fork'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	385	adding b
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	386	$ echo b >> b
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	387	$ hg ci -mb
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	388	$ hg ci --amend --close-branch -m 'closing branch foo'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	389	saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	390
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	391	Same thing, different code path:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	392
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	393	$ echo b >> b
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	394	$ hg ci -m 'reopen branch'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	395	reopening closed branch head 4
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	396	$ echo b >> b
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	397	$ hg ci --amend --close-branch
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	398	saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	399	$ hg branches
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	400	default 2:9c07515f2650
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	401
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	402	Refuse to amend during a merge:
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	403
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	404	$ hg up -q default
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	405	$ hg merge foo
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	406	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	407	(branch merge, don't forget to commit)
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	408	$ hg ci --amend
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	409	abort: cannot amend while merging
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	410	[255]
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	411	$ hg ci -m 'merge'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	412
36844 eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	413	Refuse to amend if there is a merge conflict (issue5805):
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	414
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	415	$ hg up -q foo
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	416	$ echo c > a
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	417	$ hg up default -t :fail
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	418	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	419	use 'hg resolve' to retry unresolved file merges
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	420	[1]
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	421	$ hg resolve -l
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	422	U a
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	423
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	424	$ hg ci --amend
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	425	abort: unresolved merge conflicts (see 'hg help resolve')
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	426	[255]
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	427
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	428	$ hg up -qC .
eeb87b24aea7 amend: abort if unresolved merge conflicts found (issue5805) Yuya Nishihara <yuya@tcha.org> parents: 35709 diff changeset	429
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	430	Follow copies/renames:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	431
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	432	$ hg mv b c
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	433	$ hg ci -m 'b -> c'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	434	$ hg mv c d
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	435	$ hg ci --amend -m 'b -> d'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	436	saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg
16483 3c4910364797 tests: ^ must be quoted when used on solaris sh Mads Kiilerich <mads@kiilerich.com> parents: 16458 diff changeset	437	$ hg st --rev '.^' --copies d
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	438	A d
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	439	b
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	440	$ hg cp d e
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	441	$ hg ci -m 'e = d'
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	442	$ hg cp e f
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	443	$ hg ci --amend -m 'f = d'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	444	saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg
16483 3c4910364797 tests: ^ must be quoted when used on solaris sh Mads Kiilerich <mads@kiilerich.com> parents: 16458 diff changeset	445	$ hg st --rev '.^' --copies f
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	446	A f
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	447	d
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	448
16552 90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	449	$ mv f f.orig
90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	450	$ hg rm -A f
90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	451	$ hg ci -m removef
90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	452	$ hg cp a f
90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	453	$ mv f.orig f
90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	454	$ hg ci --amend -m replacef
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	455	saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg
16552 90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	456	$ hg st --change . --copies
90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	457	$ hg log -r . --template "{file_copies}\n"
16553 9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	458
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	459
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	460	Move added file (issue3410):
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	461
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	462	$ echo g >> g
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	463	$ hg ci -Am g
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	464	adding g
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	465	$ hg mv g h
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	466	$ hg ci --amend
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	467	saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg
16553 9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	468	$ hg st --change . --copies h
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	469	A h
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	470	$ hg log -r . --template "{file_copies}\n"
9224cc2e99cc amend: fix copy records handling (issue3410) Patrick Mezard <patrick@mezard.eu> parents: 16552 diff changeset	471
16552 90ca344a7c55 test-commit-amend: exhibit an --amend weirdness Patrick Mezard <patrick@mezard.eu> parents: 16539 diff changeset	472
16458 55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	473	Can't rollback an amend:
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	474
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	475	$ hg rollback
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	476	no rollback information available
55982f62651f commit: add option to amend the working dir parent Idan Kamara <idankk86@gmail.com> parents: diff changeset	477	[1]
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	478
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	479	Preserve extra dict (issue3430):
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	480
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	481	$ hg branch a
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	482	marked working directory as branch a
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	483	(branches are permanent and global, did you want a bookmark?)
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	484	$ echo a >> a
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	485	$ hg ci -ma
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	486	$ hg ci --amend -m "a'"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	487	saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	488	$ hg log -r . --template "{branch}\n"
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	489	a
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	490	$ hg ci --amend -m "a''"
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	491	saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	492	$ hg log -r . --template "{branch}\n"
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	493	a
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	494
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	495	Also preserve other entries in the dict that are in the old commit,
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	496	first graft something so there's an additional entry:
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	497
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	498	$ hg up 0 -q
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	499	$ echo z > z
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	500	$ hg ci -Am 'fork'
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	501	adding z
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	502	created new head
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	503	$ hg up 11
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	504	5 files updated, 0 files merged, 1 files removed, 0 files unresolved
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	505	$ hg graft 12
23505 bd5dbb8a05c8 graft: show more useful status information while grafting Mads Kiilerich <madski@unity3d.com> parents: 23139 diff changeset	506	grafting 12:2647734878ef "fork" (tip)
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	507	$ hg ci --amend -m 'graft amend'
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	508	saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	509	$ hg log -r . --debug \| grep extra
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	510	extra: amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60
16630 f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	511	extra: branch=a
f30226b1a46a amend: preserve extra dict (issue3430) Idan Kamara <idankk86@gmail.com> parents: 16553 diff changeset	512	extra: source=2647734878ef0236dda712fae9c1651cf694ea8a
17461 bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	513
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	514	Preserve phase
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	515
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	516	$ hg phase '.^::.'
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	517	11: draft
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	518	13: draft
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	519	$ hg phase --secret --force .
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	520	$ hg phase '.^::.'
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	521	11: draft
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	522	13: secret
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	523	$ hg commit --amend -m 'amend for phase' -q
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	524	$ hg phase '.^::.'
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	525	11: draft
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	526	13: secret
bacde764fba0 amend: preserve phase of amended revision (issue3602) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17060 diff changeset	527
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	528	Test amend with obsolete
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	529	---------------------------
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	530
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	531	Enable obsolete
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	532
22956 a0f89c852a0c obsolete: update test-commit-amend to use obsolete option Durham Goode <durham@fb.com> parents: 22249 diff changeset	533	$ cat >> $HGRCPATH << EOF
a0f89c852a0c obsolete: update test-commit-amend to use obsolete option Durham Goode <durham@fb.com> parents: 22249 diff changeset	534	> [experimental]
34866 1644623ab096 config: use 'experimental.evolution.create-markers' Boris Feld <boris.feld@octobus.net> parents: 34085 diff changeset	535	> evolution.createmarkers=True
34867 7f183c643eb6 config: use 'experimental.evolution.allowunstable' Boris Feld <boris.feld@octobus.net> parents: 34866 diff changeset	536	> evolution.allowunstable=True
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	537	> EOF
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	538
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	539	Amend with no files changes
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	540
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	541	$ hg id -n
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	542	13
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	543	$ hg ci --amend -m 'babar'
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	544	$ hg id -n
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	545	14
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	546	$ hg log -Gl 3 --style=compact
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	547	@ 14[tip]:11 682950e85999 1970-01-01 00:00 +0000 test
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	548	\| babar
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	549	\|
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	550	\| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	551	\| \| fork
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	552	\| ~
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	553	o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	554	\| a''
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	555	~
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	556	$ hg log -Gl 4 --hidden --style=compact
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	557	@ 14[tip]:11 682950e85999 1970-01-01 00:00 +0000 test
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	558	\| babar
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	559	\|
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	560	\| x 13:11 5167600b0f7a 1970-01-01 00:00 +0000 test
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	561	\|/ amend for phase
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	562	\|
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	563	\| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	564	\| \| fork
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	565	\| ~
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	566	o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	567	\| a''
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	568	~
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	569
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	570	Amend with files changes
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	571
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	572	(note: the extra commit over 15 is a temporary junk I would be happy to get
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	573	ride of)
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	574
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	575	$ echo 'babar' >> a
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	576	$ hg commit --amend
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	577	$ hg log -Gl 6 --hidden --style=compact
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	578	@ 15[tip]:11 a5b42b49b0d5 1970-01-01 00:00 +0000 test
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	579	\| babar
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	580	\|
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	581	\| x 14:11 682950e85999 1970-01-01 00:00 +0000 test
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	582	\|/ babar
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	583	\|
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	584	\| x 13:11 5167600b0f7a 1970-01-01 00:00 +0000 test
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	585	\|/ amend for phase
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	586	\|
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	587	\| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	588	\| \| fork
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	589	\| ~
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	590	o 11 0ddb275cfad1 1970-01-01 00:00 +0000 test
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	591	\| a''
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	592	\|
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	593	o 10 5fa75032e226 1970-01-01 00:00 +0000 test
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	594	\| g
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 27597 diff changeset	595	~
17475 63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	596
63e45aee46d4 amend: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17473 diff changeset	597
18399 66cec3c2ee00 tests: more comment cleanup related to obsolescence Kevin Bullock <kbullock@ringworld.org> parents: 18398 diff changeset	598	Test that amend does not make it easy to create obsolescence cycle
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	599	---------------------------------------------------------------------
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	600
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18206 diff changeset	601	$ hg id -r 14 --hidden
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	602	682950e85999 (a)
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18206 diff changeset	603	$ hg revert -ar 14 --hidden
17811 a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	604	reverting a
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	605	$ hg commit --amend
a8aba2921456 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17475 diff changeset	606	$ hg id
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	607	37973c7e0b61 (a) tip
18163 c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	608
18398 1a00c8451640 test: fix in-test comments related to obsolescence Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18267 diff changeset	609	Test that rewriting leaving instability behind is allowed
18163 c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	610	---------------------------------------------------------------------
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	611
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	612	$ hg up '.^'
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	613	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	614	$ echo 'b' >> a
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	615	$ hg log --style compact -r 'children(.)'
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	616	16[tip]:11 37973c7e0b61 1970-01-01 00:00 +0000 test
18163 c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	617	babar
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	618
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	619	$ hg commit --amend
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35393 diff changeset	620	1 new orphan changesets
33774 9dcc3529e002 revset: rename unstable into orphan Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	621	$ hg log -r 'orphan()'
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	622	changeset: 16:37973c7e0b61
18163 c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	623	branch: a
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	624	parent: 11:0ddb275cfad1
18163 c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	625	user: test
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	626	date: Thu Jan 01 00:00:00 1970 +0000
33667 03039ff3082b evolution: rename unstable to orphan Boris Feld <boris.feld@octobus.net> parents: 33666 diff changeset	627	instability: orphan
18163 c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	628	summary: babar
c5bd753c5bc6 amend: allow amend of non-head when obsolete is enabled Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17924 diff changeset	629
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	630
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	631	Amend a merge changeset (with renames and conflicts from the second parent):
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	632
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	633	$ hg up -q default
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	634	$ hg branch -q bar
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	635	$ hg cp a aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	636	$ hg mv z zz
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	637	$ echo cc > cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	638	$ hg add cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	639	$ hg ci -m aazzcc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	640	$ hg up -q default
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	641	$ echo a >> a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	642	$ echo dd > cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	643	$ hg add cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	644	$ hg ci -m aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	645	$ hg merge -q bar
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 25393 diff changeset	646	warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	647	[1]
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	648	$ hg resolve -m cc
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21693 diff changeset	649	(no more unresolved files)
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	650	$ hg ci -m 'merge bar'
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	651	$ hg log --config diff.git=1 -pr .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	652	changeset: 20:163cfd7219f7
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	653	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	654	parent: 19:30d96aeaf27b
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	655	parent: 18:1aa437659d19
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	656	user: test
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	657	date: Thu Jan 01 00:00:00 1970 +0000
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	658	summary: merge bar
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	659
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	660	diff --git a/a b/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	661	copy from a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	662	copy to aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	663	diff --git a/cc b/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	664	--- a/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	665	+++ b/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	666	@@ -1,1 +1,5 @@
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	667	+<<<<<<< working copy: 30d96aeaf27b - test: aa
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	668	dd
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	669	+=======
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	670	+cc
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	671	+>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	672	diff --git a/z b/zz
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	673	rename from z
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	674	rename to zz
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	675
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	676	$ hg debugrename aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	677	aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	678	$ hg debugrename zz
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	679	zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	680	$ hg debugrename cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	681	cc not renamed
22249 f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	682	$ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit
f5ff18f65b73 commit: change "editform" to distinguish merge commits from other (--amend) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21947 diff changeset	683	HGEDITFORM=commit.amend.merge
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	684	$ hg log --config diff.git=1 -pr .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	685	changeset: 21:bca52d4ed186
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	686	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	687	parent: 19:30d96aeaf27b
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	688	parent: 18:1aa437659d19
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	689	user: test
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	690	date: Thu Jan 01 00:00:00 1970 +0000
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	691	summary: merge bar (amend message)
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	692
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	693	diff --git a/a b/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	694	copy from a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	695	copy to aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	696	diff --git a/cc b/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	697	--- a/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	698	+++ b/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	699	@@ -1,1 +1,5 @@
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	700	+<<<<<<< working copy: 30d96aeaf27b - test: aa
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	701	dd
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	702	+=======
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	703	+cc
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	704	+>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	705	diff --git a/z b/zz
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	706	rename from z
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	707	rename to zz
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	708
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	709	$ hg debugrename aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	710	aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	711	$ hg debugrename zz
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	712	zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	713	$ hg debugrename cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	714	cc not renamed
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	715	$ hg mv zz z
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	716	$ hg ci --amend -m 'merge bar (undo rename)'
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	717	$ hg log --config diff.git=1 -pr .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	718	changeset: 22:12594a98ca3f
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	719	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	720	parent: 19:30d96aeaf27b
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	721	parent: 18:1aa437659d19
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	722	user: test
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	723	date: Thu Jan 01 00:00:00 1970 +0000
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	724	summary: merge bar (undo rename)
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	725
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	726	diff --git a/a b/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	727	copy from a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	728	copy to aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	729	diff --git a/cc b/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	730	--- a/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	731	+++ b/cc
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	732	@@ -1,1 +1,5 @@
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	733	+<<<<<<< working copy: 30d96aeaf27b - test: aa
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	734	dd
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	735	+=======
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	736	+cc
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	737	+>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	738
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	739	$ hg debugrename z
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	740	z not renamed
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	741
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	742	Amend a merge changeset (with renames during the merge):
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	743
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	744	$ hg up -q bar
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	745	$ echo x > x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	746	$ hg add x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	747	$ hg ci -m x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	748	$ hg up -q default
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	749	$ hg merge -q bar
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	750	$ hg mv aa aaa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	751	$ echo aa >> aaa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	752	$ hg ci -m 'merge bar again'
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	753	$ hg log --config diff.git=1 -pr .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	754	changeset: 24:dffde028b388
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	755	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	756	parent: 22:12594a98ca3f
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	757	parent: 23:4c94d5bc65f5
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	758	user: test
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	759	date: Thu Jan 01 00:00:00 1970 +0000
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	760	summary: merge bar again
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	761
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	762	diff --git a/aa b/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	763	deleted file mode 100644
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	764	--- a/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	765	+++ /dev/null
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	766	@@ -1,2 +0,0 @@
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	767	-a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	768	-a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	769	diff --git a/aaa b/aaa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	770	new file mode 100644
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	771	--- /dev/null
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	772	+++ b/aaa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	773	@@ -0,0 +1,3 @@
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	774	+a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	775	+a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	776	+aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	777	diff --git a/x b/x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	778	new file mode 100644
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	779	--- /dev/null
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	780	+++ b/x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	781	@@ -0,0 +1,1 @@
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	782	+x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	783
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	784	$ hg debugrename aaa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	785	aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	786	$ hg mv aaa aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	787	$ hg ci --amend -m 'merge bar again (undo rename)'
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	788	$ hg log --config diff.git=1 -pr .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	789	changeset: 25:18e3ba160489
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	790	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	791	parent: 22:12594a98ca3f
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	792	parent: 23:4c94d5bc65f5
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	793	user: test
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	794	date: Thu Jan 01 00:00:00 1970 +0000
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	795	summary: merge bar again (undo rename)
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	796
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	797	diff --git a/aa b/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	798	--- a/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	799	+++ b/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	800	@@ -1,2 +1,3 @@
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	801	a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	802	a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	803	+aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	804	diff --git a/x b/x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	805	new file mode 100644
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	806	--- /dev/null
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	807	+++ b/x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	808	@@ -0,0 +1,1 @@
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	809	+x
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	810
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	811	$ hg debugrename aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	812	aa not renamed
18912 4e1ae55e63ef test-commit-amend.t: fix check-code violation from 3a72c89a83ec Augie Fackler <raf@durin42.com> parents: 18909 diff changeset	813	$ hg debugrename -r '.^' aa
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	814	aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	815
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	816	Amend a merge changeset (with manifest-level conflicts):
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	817
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	818	$ hg up -q bar
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	819	$ hg rm aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	820	$ hg ci -m 'rm aa'
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	821	$ hg up -q default
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	822	$ echo aa >> aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	823	$ hg ci -m aa
27597 fe150586d9bd tests: explicitly request changed version in c/d conflict in test-commit-amend.t Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	824	$ hg merge -q bar --config ui.interactive=True << EOF
fe150586d9bd tests: explicitly request changed version in c/d conflict in test-commit-amend.t Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	825	> c
fe150586d9bd tests: explicitly request changed version in c/d conflict in test-commit-amend.t Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	826	> EOF
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	827	file 'aa' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 38722 diff changeset	828	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 26927 diff changeset	829	use (c)hanged version, (d)elete, or leave (u)nresolved? c
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	830	$ hg ci -m 'merge bar (with conflicts)'
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	831	$ hg log --config diff.git=1 -pr .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	832	changeset: 28:b4c3035e2544
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	833	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	834	parent: 27:4b216ca5ba97
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	835	parent: 26:67db8847a540
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	836	user: test
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	837	date: Thu Jan 01 00:00:00 1970 +0000
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	838	summary: merge bar (with conflicts)
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	839
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	840
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	841	$ hg rm aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	842	$ hg ci --amend -m 'merge bar (with conflicts, amended)'
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	843	$ hg log --config diff.git=1 -pr .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	844	changeset: 29:1205ed810051
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	845	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	846	parent: 27:4b216ca5ba97
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	847	parent: 26:67db8847a540
18909 3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	848	user: test
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	849	date: Thu Jan 01 00:00:00 1970 +0000
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	850	summary: merge bar (with conflicts, amended)
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	851
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	852	diff --git a/aa b/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	853	deleted file mode 100644
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	854	--- a/aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	855	+++ /dev/null
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	856	@@ -1,4 +0,0 @@
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	857	-a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	858	-a
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	859	-aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	860	-aa
3a72c89a83ec amend: support amending merge changesets (issue3778) Brodie Rao <brodie@sf.io> parents: 18399 diff changeset	861
19305 b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	862	Issue 3445: amending with --close-branch a commit that created a new head should fail
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	863	This shouldn't be possible:
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	864
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	865	$ hg up -q default
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	866	$ hg branch closewithamend
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	867	marked working directory as branch closewithamend
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	868	$ echo foo > foo
22956 a0f89c852a0c obsolete: update test-commit-amend to use obsolete option Durham Goode <durham@fb.com> parents: 22249 diff changeset	869	$ hg add foo
19980 0151b61fed97 test: do not add .pyc and .orig in test-commit-amend.t (issue4085) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19305 diff changeset	870	$ hg ci -m..
19305 b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	871	$ hg ci --amend --close-branch -m 'closing'
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	872	abort: can only close branch heads
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	873	[255]
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	874
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	875	This silliness fails:
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	876
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	877	$ hg branch silliness
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	878	marked working directory as branch silliness
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	879	$ echo b >> b
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	880	$ hg ci --close-branch -m'open and close'
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	881	abort: can only close branch heads
b500a663a2c7 commit: amending with --close-branch (issue3445) Iulian Stana <julian.stana@gmail.com> parents: 18912 diff changeset	882	[255]
20700 b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19980 diff changeset	883
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19980 diff changeset	884	Test that amend with --secret creates new secret changeset forcibly
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19980 diff changeset	885	---------------------------------------------------------------------
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19980 diff changeset	886
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19980 diff changeset	887	$ hg phase '.^::.'
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	888	29: draft
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	889	30: draft
20700 b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19980 diff changeset	890	$ hg commit --amend --secret -m 'amend as secret' -q
b0153cb8b64e commit: create new amend changeset as secret correctly for "--secret" option FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19980 diff changeset	891	$ hg phase '.^::.'
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	892	29: draft
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	893	31: secret
21036 a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	894
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	895	Test that amend with --edit invokes editor forcibly
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	896	---------------------------------------------------
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	897
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	898	$ hg parents --template "{desc}\n"
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	899	amend as secret
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	900	$ HGEDITOR=cat hg commit --amend -m "editor should be suppressed"
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	901	$ hg parents --template "{desc}\n"
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	902	editor should be suppressed
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	903
23587 8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23505 diff changeset	904	$ hg status --rev '.^1::.'
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23505 diff changeset	905	A foo
21036 a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	906	$ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	907	editor should be invoked
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	908
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	909
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	910	HG: Enter commit message. Lines beginning with 'HG:' are removed.
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	911	HG: Leave message empty to abort commit.
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	912	HG: --
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	913	HG: user: test
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	914	HG: branch 'silliness'
23587 8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23505 diff changeset	915	HG: added foo
21036 a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	916	$ hg parents --template "{desc}\n"
a1a1bd09e4f4 amend: invoke editor forcibly when "--edit" option is specified FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20771 diff changeset	917	editor should be invoked
23071 652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	918
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	919	Test that "diff()" in committemplate works correctly for amending
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	920	-----------------------------------------------------------------
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	921
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	922	$ cat >> .hg/hgrc <<EOF
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	923	> [committemplate]
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	924	> changeset.commit.amend = {desc}\n
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	925	> HG: M: {file_mods}
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	926	> HG: A: {file_adds}
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	927	> HG: R: {file_dels}
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	928	> {splitlines(diff()) % 'HG: {line}\n'}
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	929	> EOF
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	930
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	931	$ hg parents --template "M: {file_mods}\nA: {file_adds}\nR: {file_dels}\n"
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	932	M:
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	933	A: foo
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	934	R:
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	935	$ hg status -amr
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	936	$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	937	expecting diff of foo
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	938
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	939	HG: M:
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	940	HG: A: foo
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	941	HG: R:
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	942	HG: diff -r 1205ed810051 foo
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	943	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	944	HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	945	HG: @@ -0,0 +1,1 @@
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	946	HG: +foo
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	947
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	948	$ echo y > y
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	949	$ hg add y
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	950	$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	951	expecting diff of foo and y
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	952
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	953	HG: M:
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	954	HG: A: foo y
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	955	HG: R:
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	956	HG: diff -r 1205ed810051 foo
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	957	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	958	HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	959	HG: @@ -0,0 +1,1 @@
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	960	HG: +foo
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	961	HG: diff -r 1205ed810051 y
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	962	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	963	HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	964	HG: @@ -0,0 +1,1 @@
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	965	HG: +y
87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	966
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	967	$ hg rm a
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	968	$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	969	expecting diff of a, foo and y
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	970
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	971	HG: M:
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	972	HG: A: foo y
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	973	HG: R: a
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	974	HG: diff -r 1205ed810051 a
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	975	HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	976	HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	977	HG: @@ -1,2 +0,0 @@
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	978	HG: -a
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	979	HG: -a
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	980	HG: diff -r 1205ed810051 foo
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	981	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	982	HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	983	HG: @@ -0,0 +1,1 @@
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	984	HG: +foo
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	985	HG: diff -r 1205ed810051 y
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	986	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	987	HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	988	HG: @@ -0,0 +1,1 @@
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	989	HG: +y
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	990
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	991	$ hg rm x
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	992	$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	993	expecting diff of a, foo, x and y
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	994
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	995	HG: M:
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	996	HG: A: foo y
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	997	HG: R: a x
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	998	HG: diff -r 1205ed810051 a
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	999	HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1000	HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1001	HG: @@ -1,2 +0,0 @@
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1002	HG: -a
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1003	HG: -a
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	1004	HG: diff -r 1205ed810051 foo
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1005	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1006	HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1007	HG: @@ -0,0 +1,1 @@
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1008	HG: +foo
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	1009	HG: diff -r 1205ed810051 x
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1010	HG: --- a/x Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1011	HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1012	HG: @@ -1,1 +0,0 @@
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1013	HG: -x
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	1014	HG: diff -r 1205ed810051 y
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1015	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1016	HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1017	HG: @@ -0,0 +1,1 @@
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	1018	HG: +y
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	1019
25392 ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1020	$ echo cccc >> cc
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1021	$ hg status -amr
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1022	M cc
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1023	$ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1024	cc should be excluded
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1025
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1026	HG: M:
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1027	HG: A: foo y
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1028	HG: R: a x
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	1029	HG: diff -r 1205ed810051 a
25392 ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1030	HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1031	HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1032	HG: @@ -1,2 +0,0 @@
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1033	HG: -a
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1034	HG: -a
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	1035	HG: diff -r 1205ed810051 foo
25392 ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1036	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1037	HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1038	HG: @@ -0,0 +1,1 @@
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1039	HG: +foo
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	1040	HG: diff -r 1205ed810051 x
25392 ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1041	HG: --- a/x Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1042	HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1043	HG: @@ -1,1 +0,0 @@
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1044	HG: -x
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30432 diff changeset	1045	HG: diff -r 1205ed810051 y
25392 ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1046	HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1047	HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1048	HG: @@ -0,0 +1,1 @@
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1049	HG: +y
ed18f4acf435 templatekw: compare target context and its parent exactly (issue4690) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24229 diff changeset	1050
23071 652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1051	Check for issue4405
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1052	-------------------
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1053
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1054	Setup the repo with a file that gets moved in a second commit.
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1055	$ hg init repo
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1056	$ cd repo
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1057	$ touch a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1058	$ hg add a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1059	$ hg commit -m a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1060	$ hg mv a0 a1
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1061	$ hg commit -m a1
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1062	$ hg up -q 0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1063	$ hg log -G --template '{rev} {desc}'
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1064	o 1 a1
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1065	\|
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1066	@ 0 a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1067
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1068
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1069	Now we branch the repro, but re-use the file contents, so we have a divergence
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1070	in the file revlog topology and the changelog topology.
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1071	$ hg revert --rev 1 --all
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1072	removing a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1073	adding a1
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1074	$ hg ci -qm 'a1-amend'
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1075	$ hg log -G --template '{rev} {desc}'
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1076	@ 2 a1-amend
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1077	\|
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1078	\| o 1 a1
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1079	\|/
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1080	o 0 a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1081
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1082
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1083	The way mercurial does amends is by folding the working copy and old commit
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1084	together into another commit (rev 3). During this process, _findlimit is called
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1085	to check how far back to look for the transitive closure of file copy
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1086	information, but due to the divergence of the filelog and changelog graph
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1087	topologies, before _findlimit was fixed, it returned a rev which was not far
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1088	enough back in this case.
23071 652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1089	$ hg mv a1 a2
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1090	$ hg status --copies --rev 0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1091	A a2
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1092	a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1093	R a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1094	$ hg ci --amend -q
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1095	$ hg log -G --template '{rev} {desc}'
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1096	@ 3 a1-amend
23071 652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1097	\|
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1098	\| o 1 a1
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1099	\|/
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1100	o 0 a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1101
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1102
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1103	Before the fix, the copy information was lost.
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1104	$ hg status --copies --rev 0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1105	A a2
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1106	a0
652ab726ba93 amend: fix amending rename commit with diverged topologies (issue4405) Ryan McElroy <rmcelroy@fb.com> parents: 22956 diff changeset	1107	R a0
24169 ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1108	$ cd ..
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1109
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1110	Check that amend properly preserve rename from directory rename (issue-4516)
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1111
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1112	If a parent of the merge renames a full directory, any files added to the old
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1113	directory in the other parent will be renamed to the new directory. For some
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1114	reason, the rename metadata was when amending such merge. This test ensure we
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1115	do not regress. We have a dedicated repo because it needs a setup with renamed
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1116	directory)
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1117
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1118	$ hg init issue4516
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1119	$ cd issue4516
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1120	$ mkdir olddirname
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1121	$ echo line1 > olddirname/commonfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1122	$ hg add olddirname/commonfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1123	$ hg ci -m first
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1124
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1125	$ hg branch newdirname
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1126	marked working directory as branch newdirname
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1127	(branches are permanent and global, did you want a bookmark?)
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1128	$ hg mv olddirname newdirname
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	1129	moving olddirname/commonfile.py to newdirname/commonfile.py
24169 ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1130	$ hg ci -m rename
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1131
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1132	$ hg update default
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1133	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1134	$ echo line1 > olddirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1135	$ hg add olddirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1136	$ hg ci -m log
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1137
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1138	$ hg up newdirname
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1139	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1140	$ # create newdirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1141	$ hg merge default
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1142	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1143	(branch merge, don't forget to commit)
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1144	$ hg ci -m add
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1145	$
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1146	$ hg debugrename newdirname/newfile.py
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	1147	newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
24169 ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1148	$ hg status -C --change .
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1149	A newdirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1150	$ hg status -C --rev 1
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1151	A newdirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1152	$ hg status -C --rev 2
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1153	A newdirname/commonfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1154	olddirname/commonfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1155	A newdirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1156	olddirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1157	R olddirname/commonfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1158	R olddirname/newfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1159	$ hg debugindex newdirname/newfile.py
37283 d4e62df1c73d debugcommands: drop offset and length from debugindex by default Gregory Szorc <gregory.szorc@gmail.com> parents: 37282 diff changeset	1160	rev linkrev nodeid p1 p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default Gregory Szorc <gregory.szorc@gmail.com> parents: 37282 diff changeset	1161	0 3 34a4d536c0c0 000000000000 000000000000
24169 ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1162
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1163	$ echo a >> newdirname/commonfile.py
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1164	$ hg ci --amend -m bug
ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1165	$ hg debugrename newdirname/newfile.py
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35244 diff changeset	1166	newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def
24169 ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1167	$ hg debugindex newdirname/newfile.py
37283 d4e62df1c73d debugcommands: drop offset and length from debugindex by default Gregory Szorc <gregory.szorc@gmail.com> parents: 37282 diff changeset	1168	rev linkrev nodeid p1 p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default Gregory Szorc <gregory.szorc@gmail.com> parents: 37282 diff changeset	1169	0 3 34a4d536c0c0 000000000000 000000000000
24169 ac41aa4a66ab amend: check for directory renames for both merge parents (issue4516) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23835 diff changeset	1170
30240 8237c3359db5 tests: test preserving execbit changes at amending only on execbit platform FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30211 diff changeset	1171	#if execbit
8237c3359db5 tests: test preserving execbit changes at amending only on execbit platform FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30211 diff changeset	1172
29181 dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1173	Test if amend preserves executable bit changes
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1174	$ chmod +x newdirname/commonfile.py
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1175	$ hg ci -m chmod
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1176	$ hg ci --amend -m "chmod amended"
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1177	$ hg ci --amend -m "chmod amended second time"
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1178	$ hg log -p --git -r .
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1179	changeset: 7:b1326f52dddf
29181 dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1180	branch: newdirname
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1181	tag: tip
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34059 diff changeset	1182	parent: 4:7fd235f7cb2f
29181 dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1183	user: test
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1184	date: Thu Jan 01 00:00:00 1970 +0000
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1185	summary: chmod amended second time
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1186
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1187	diff --git a/newdirname/commonfile.py b/newdirname/commonfile.py
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1188	old mode 100644
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1189	new mode 100755
dae38633eba8 localrepo: prevent executable-bit only changes from being lost on amend Mateusz Kwapich <mitrandir@fb.com> parents: 28627 diff changeset	1190
30240 8237c3359db5 tests: test preserving execbit changes at amending only on execbit platform FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30211 diff changeset	1191	#endif
34059 6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1192
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1193	Test amend with file inclusion options
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1194	--------------------------------------
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1195
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1196	These tests ensure that we are always amending some files that were part of the
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1197	pre-amend commit. We want to test that the remaining files in the pre-amend
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1198	commit were not changed in the amended commit. We do so by performing a diff of
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1199	the amended commit against its parent commit.
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1200	$ cd ..
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1201	$ hg init testfileinclusions
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1202	$ cd testfileinclusions
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1203	$ echo a > a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1204	$ echo b > b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1205	$ hg commit -Aqm "Adding a and b"
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1206
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1207	Only add changes to a particular file
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1208	$ echo a >> a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1209	$ echo b >> b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1210	$ hg commit --amend -I a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1211	$ hg diff --git -r null -r .
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1212	diff --git a/a b/a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1213	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1214	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1215	+++ b/a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1216	@@ -0,0 +1,2 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1217	+a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1218	+a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1219	diff --git a/b b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1220	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1221	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1222	+++ b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1223	@@ -0,0 +1,1 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1224	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1225
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1226	$ echo a >> a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1227	$ hg commit --amend b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1228	$ hg diff --git -r null -r .
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1229	diff --git a/a b/a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1230	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1231	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1232	+++ b/a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1233	@@ -0,0 +1,2 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1234	+a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1235	+a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1236	diff --git a/b b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1237	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1238	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1239	+++ b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1240	@@ -0,0 +1,2 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1241	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1242	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1243
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1244	Exclude changes to a particular file
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1245	$ echo b >> b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1246	$ hg commit --amend -X a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1247	$ hg diff --git -r null -r .
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1248	diff --git a/a b/a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1249	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1250	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1251	+++ b/a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1252	@@ -0,0 +1,2 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1253	+a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1254	+a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1255	diff --git a/b b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1256	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1257	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1258	+++ b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1259	@@ -0,0 +1,3 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1260	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1261	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1262	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1263
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1264	Check the addremove flag
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1265	$ echo c > c
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1266	$ rm a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1267	$ hg commit --amend -A
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1268	removing a
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1269	adding c
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1270	$ hg diff --git -r null -r .
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1271	diff --git a/b b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1272	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1273	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1274	+++ b/b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1275	@@ -0,0 +1,3 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1276	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1277	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1278	+b
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1279	diff --git a/c b/c
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1280	new file mode 100644
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1281	--- /dev/null
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1282	+++ b/c
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1283	@@ -0,0 +1,1 @@
6fb5a06b92c6 amend: add tests for amending only some files from commit to be amended Saurabh Singh <singhsrb@fb.com> parents: 33774 diff changeset	1284	+c

author	Gregory Szorc <gregory.szorc@gmail.com>
	Mon, 08 Oct 2018 18:17:12 -0700
changeset 40176	41263df08109
parent 39285	a3fd84f4fb38
child 42213	618b9ffefa87
permissions	-rw-r--r--