mercurial-scm/hg: tests/test-uncommit.t annotate

annotate tests/test-uncommit.t @ 41859:bf22e370ae9a

uncommit: don't allow dirty working copy with PATH (issue5977) On a dirty PATH, uncommit was working without even setting the config `experimental.uncommitondirtydir` to `True`. Ideally, it should abort as it does for a dirty dir. This patch makes uncommit to require the config option `experimental.uncommitondirtydir` on a dirty PATH. Original patch to evolve extension authored by Dan Villiom Podlaski Christiansen: https://bitbucket.org/octobus/evolve-devel/pull-requests/8/bug-5977-uncommit-dirtiness/diff Differential Revision: https://phab.mercurial-scm.org/D5940

author	Navaneeth Suresh <navaneeths1998@gmail.com>
date	Tue, 12 Feb 2019 00:17:42 +0530
parents	1040d54eb7eb
children	aa284d9a33ca

rev	line source
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	1 Test uncommit - set up the config
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	3 $ cat >> $HGRCPATH <<EOF
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	4 > [experimental]
34866 1644623ab096 config: use 'experimental.evolution.create-markers' Boris Feld <boris.feld@octobus.net> parents: 34304 diff changeset	5 > evolution.createmarkers=True
34867 7f183c643eb6 config: use 'experimental.evolution.allowunstable' Boris Feld <boris.feld@octobus.net> parents: 34866 diff changeset	6 > evolution.allowunstable=True
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7 > [extensions]
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8 > uncommit =
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9 > drawdag=$TESTDIR/drawdag.py
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	10 > EOF
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	11
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12 Build up a repo
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	13
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14 $ hg init repo
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15 $ cd repo
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16 $ hg bookmark foo
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	17
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	18 Help for uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	19
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	20 $ hg help uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	21 hg uncommit [OPTION]... [FILE]...
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	22
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	23 uncommit part or all of a local changeset
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	24
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	25 This command undoes the effect of a local commit, returning the affected
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	26 files to their uncommitted state. This means that files modified or
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	27 deleted in the changeset will be left unchanged, and so will remain
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	28 modified in the working directory.
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	29
36973 d63c5c651183 uncommit: document when the commit will be pruned Martin von Zweigbergk <martinvonz@google.com> parents: 36972 diff changeset	30 If no files are specified, the commit will be pruned, unless --keep is
d63c5c651183 uncommit: document when the commit will be pruned Martin von Zweigbergk <martinvonz@google.com> parents: 36972 diff changeset	31 given.
d63c5c651183 uncommit: document when the commit will be pruned Martin von Zweigbergk <martinvonz@google.com> parents: 36972 diff changeset	32
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	33 (use 'hg help -e uncommit' to show help for the uncommit extension)
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	34
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	35 options ([+] can be repeated):
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	36
41010 e8e2a7656e83 help: hide default value for default-off flags Martin von Zweigbergk <martinvonz@google.com> parents: 41009 diff changeset	37 --keep allow an empty commit after uncommiting
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	38 -I --include PATTERN [+] include names matching the given patterns
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	39 -X --exclude PATTERN [+] exclude names matching the given patterns
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	40
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	41 (some details hidden, use --verbose to show complete help)
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	42
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	43 Uncommit with no commits should fail
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	44
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	45 $ hg uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	46 abort: cannot uncommit null changeset
35244 98f97eb20597 rewriteutil: use precheck() in uncommit and amend commands Pulkit Goyal <7895pulkit@gmail.com> parents: 34867 diff changeset	47 (no changeset checked out)
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	48 [255]
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	49
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	50 Create some commits
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	51
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	52 $ touch files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	53 $ hg add files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	54 $ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	55 $ ls
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	56 file-a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	57 file-ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	58 file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	59 file-abcd
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	60 file-abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	61 files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	62
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	63 $ hg log -G -T '{rev}:{node} {desc}' --hidden
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	64 @ 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	65 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	66 o 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	67 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	68 o 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	69 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	70 o 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	71 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	72 o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	73
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	74 Simple uncommit off the top, also moves bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	75
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	76 $ hg bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	77 * foo 4:6c4fd43ed714
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	78 $ hg uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	79 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	80 M files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	81 A file-abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	82 $ hg bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	83 * foo 3:6db330d65db4
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	84
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	85 $ hg log -G -T '{rev}:{node} {desc}' --hidden
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	86 x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	87 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	88 @ 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	89 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	90 o 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	91 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	92 o 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	93 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	94 o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	95
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	96
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	97 Recommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	98
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	99 $ hg commit -m 'new change abcde'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	100 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	101 $ hg heads -T '{rev}:{node} {desc}'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	102 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde (no-eol)
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	103
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	104 Uncommit of non-existent and unchanged files has no effect
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	105 $ hg uncommit nothinghere
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	106 nothing to uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	107 [1]
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	108 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	109 $ hg uncommit file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	110 nothing to uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	111 [1]
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	112 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	113
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	114 Try partial uncommit, also moves bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	115
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	116 $ hg bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	117 * foo 5:0c07a3ccda77
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	118 $ hg uncommit files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	119 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	120 M files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	121 $ hg bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	122 * foo 6:3727deee06f7
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	123 $ hg heads -T '{rev}:{node} {desc}'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	124 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde (no-eol)
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	125 $ hg log -r . -p -T '{rev}:{node} {desc}'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	126 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcdediff -r 6db330d65db4 -r 3727deee06f7 file-abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	127 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	128 +++ b/file-abcde Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	129 @@ -0,0 +1,1 @@
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	130 +abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	131
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	132 $ hg log -G -T '{rev}:{node} {desc}' --hidden
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	133 @ 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	134 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	135 \| x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	136 \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	137 \| x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	138 \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	139 o 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	140 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	141 o 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	142 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	143 o 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	144 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	145 o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	146
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	147 $ hg commit -m 'update files for abcde'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	148
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	149 Uncommit with dirty state
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	150
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	151 $ echo "foo" >> files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	152 $ cat files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	153 abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	154 foo
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	155 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	156 M files
34284 624c53e4121d uncommit: don't allow bare uncommit on dirty working directory Pulkit Goyal <7895pulkit@gmail.com> parents: 34283 diff changeset	157 $ hg uncommit
624c53e4121d uncommit: don't allow bare uncommit on dirty working directory Pulkit Goyal <7895pulkit@gmail.com> parents: 34283 diff changeset	158 abort: uncommitted changes
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	159 (requires experimental.uncommitondirtywdir to uncommit)
34284 624c53e4121d uncommit: don't allow bare uncommit on dirty working directory Pulkit Goyal <7895pulkit@gmail.com> parents: 34283 diff changeset	160 [255]
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	161 $ hg uncommit files
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	162 abort: uncommitted changes
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	163 (requires experimental.uncommitondirtywdir to uncommit)
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	164 [255]
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	165 $ cat files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	166 abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	167 foo
36972 28ba7d111337 uncommit: leave empty commit if all files are uncommitted Martin von Zweigbergk <martinvonz@google.com> parents: 35709 diff changeset	168 $ hg commit --amend -m "files abcde + foo"
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	169
34285 7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	170 Testing the 'experimental.uncommitondirtywdir' config
7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	171
7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	172 $ echo "bar" >> files
7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	173 $ hg uncommit
7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	174 abort: uncommitted changes
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	175 (requires experimental.uncommitondirtywdir to uncommit)
34285 7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	176 [255]
7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	177 $ hg uncommit --config experimental.uncommitondirtywdir=True
7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	178 $ hg commit -m "files abcde + foo"
7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	179
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	180 Uncommit in the middle of a stack, does not move bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	181
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	182 $ hg checkout '.^^^'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	183 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	184 (leaving bookmark foo)
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	185 $ hg log -r . -p -T '{rev}:{node} {desc}'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	186 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abcdiff -r 69a232e754b0 -r abf2df566fc1 file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	187 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	188 +++ b/file-abc Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	189 @@ -0,0 +1,1 @@
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	190 +abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	191 diff -r 69a232e754b0 -r abf2df566fc1 files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	192 --- a/files Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	193 +++ b/files Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	194 @@ -1,1 +1,1 @@
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	195 -ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	196 +abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	197
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	198 $ hg bookmark
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	199 foo 9:48e5bd7cd583
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	200 $ hg uncommit
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35508 diff changeset	201 3 new orphan changesets
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	202 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	203 M files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	204 A file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	205 $ hg heads -T '{rev}:{node} {desc}'
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	206 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol)
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	207 $ hg bookmark
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	208 foo 9:48e5bd7cd583
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	209 $ hg commit -m 'new abc'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	210 created new head
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	211
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	212 Partial uncommit in the middle, does not move bookmark
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	213
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	214 $ hg checkout '.^'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	215 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	216 $ hg log -r . -p -T '{rev}:{node} {desc}'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	217 1:69a232e754b08d568c4899475faf2eb44b857802 added file-abdiff -r 3004d2d9b508 -r 69a232e754b0 file-ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	218 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	219 +++ b/file-ab Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	220 @@ -0,0 +1,1 @@
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	221 +ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	222 diff -r 3004d2d9b508 -r 69a232e754b0 files
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	223 --- a/files Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	224 +++ b/files Thu Jan 01 00:00:00 1970 +0000
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	225 @@ -1,1 +1,1 @@
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	226 -a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	227 +ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	228
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	229 $ hg bookmark
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	230 foo 9:48e5bd7cd583
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	231 $ hg uncommit file-ab
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35508 diff changeset	232 1 new orphan changesets
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	233 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	234 A file-ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	235
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	236 $ hg heads -T '{rev}:{node} {desc}\n'
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	237 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	238 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	239 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	240
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	241 $ hg bookmark
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	242 foo 9:48e5bd7cd583
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	243 $ hg commit -m 'update ab'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	244 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	245 $ hg heads -T '{rev}:{node} {desc}\n'
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	246 12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	247 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	248 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	249
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	250 $ hg log -G -T '{rev}:{node} {desc}' --hidden
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	251 @ 12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	252 \|
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	253 o 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	254 \|
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	255 \| * 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	256 \| \|
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	257 \| \| * 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	258 \| \| \|
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	259 \| \| \| x 8:84beeba0ac30e19521c036e4d2dd3a5fa02586ff files abcde + foo
34285 7b1e524ad73f uncommit: add an experimental.uncommitondirtywdir config Pulkit Goyal <7895pulkit@gmail.com> parents: 34284 diff changeset	260 \| \| \|/
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	261 \| \| \| x 7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	262 \| \| \|/
35508 9b3f95d9783d graphlog: add another graph node type, unstable, using character "" (BC) Anton Shestakov <av6@dwimlabs.net>* parents: 35244 diff changeset	263 \| \| * 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	264 \| \| \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	265 \| \| \| x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	266 \| \| \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	267 \| \| \| x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	268 \| \| \|/
35508 9b3f95d9783d graphlog: add another graph node type, unstable, using character "" (BC) Anton Shestakov <av6@dwimlabs.net>* parents: 35244 diff changeset	269 \| \| * 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	270 \| \| \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	271 \| \| x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	272 \| \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	273 \| x 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	274 \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	275 o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	276
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	277 Uncommit with draft parent
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	278
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	279 $ hg uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	280 $ hg phase -r .
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	281 11: draft
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	282 $ hg commit -m 'update ab again'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	283
38422 a6addfd64507 tests: add test of uncommit with default phase as secret Martin von Zweigbergk <martinvonz@google.com> parents: 36973 diff changeset	284 Phase is preserved
a6addfd64507 tests: add test of uncommit with default phase as secret Martin von Zweigbergk <martinvonz@google.com> parents: 36973 diff changeset	285
a6addfd64507 tests: add test of uncommit with default phase as secret Martin von Zweigbergk <martinvonz@google.com> parents: 36973 diff changeset	286 $ hg uncommit --keep --config phases.new-commit=secret
41745 83d294c71f1e uncommit: inform user if the commit is empty after uncommit Martin von Zweigbergk <martinvonz@google.com> parents: 41338 diff changeset	287 note: keeping empty commit
38422 a6addfd64507 tests: add test of uncommit with default phase as secret Martin von Zweigbergk <martinvonz@google.com> parents: 36973 diff changeset	288 $ hg phase -r .
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	289 14: draft
38422 a6addfd64507 tests: add test of uncommit with default phase as secret Martin von Zweigbergk <martinvonz@google.com> parents: 36973 diff changeset	290 $ hg commit --amend -m 'update ab again'
a6addfd64507 tests: add test of uncommit with default phase as secret Martin von Zweigbergk <martinvonz@google.com> parents: 36973 diff changeset	291
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	292 Uncommit with public parent
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	293
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	294 $ hg phase -p "::.^"
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	295 $ hg uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	296 $ hg phase -r .
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	297 11: public
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	298
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	299 Partial uncommit with public parent
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	300
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	301 $ echo xyz > xyz
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	302 $ hg add xyz
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	303 $ hg commit -m "update ab and add xyz"
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	304 $ hg uncommit xyz
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	305 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	306 A xyz
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	307 $ hg phase -r .
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	308 17: draft
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	309 $ hg phase -r ".^"
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	310 11: public
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	311
41750 1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	312 Uncommit with --keep or experimental.uncommit.keep leaves an empty changeset
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	313
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	314 $ cd $TESTTMP
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	315 $ hg init repo1
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	316 $ cd repo1
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	317 $ hg debugdrawdag <<'EOS'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	318 > Q
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	319 > \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	320 > P
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	321 > EOS
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	322 $ hg up Q -q
34283 f94442d46984 uncommit: rename the flag 'empty' to 'keep' which retains empty changeset Pulkit Goyal <7895pulkit@gmail.com> parents: 34192 diff changeset	323 $ hg uncommit --keep
41745 83d294c71f1e uncommit: inform user if the commit is empty after uncommit Martin von Zweigbergk <martinvonz@google.com> parents: 41338 diff changeset	324 note: keeping empty commit
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	325 $ hg log -G -T '{desc} FILES: {files}'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	326 @ Q FILES:
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	327 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	328 \| x Q FILES: Q
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	329 \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	330 o P FILES: P
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	331
41750 1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	332 $ cat >> .hg/hgrc <<EOF
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	333 > [experimental]
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	334 > uncommit.keep=True
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	335 > EOF
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	336 $ hg ci --amend
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	337 $ hg uncommit
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	338 note: keeping empty commit
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	339 $ hg log -G -T '{desc} FILES: {files}'
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	340 @ Q FILES:
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	341 \|
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	342 \| x Q FILES: Q
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	343 \|/
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	344 o P FILES: P
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	345
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	346 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	347 A Q
41750 1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	348 $ hg ci --amend
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	349 $ hg uncommit --no-keep
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	350 $ hg log -G -T '{desc} FILES: {files}'
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	351 x Q FILES: Q
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	352 \|
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	353 @ P FILES: P
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	354
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	355 $ hg status
1040d54eb7eb uncommit: add config option to keep commit by default Martin von Zweigbergk <martinvonz@google.com> parents: 41745 diff changeset	356 A Q
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	357 $ cd ..
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	358 $ rm -rf repo1
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	359
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	360 Testing uncommit while merge
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	361
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	362 $ hg init repo2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	363 $ cd repo2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	364
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	365 Create some history
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	366
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	367 $ touch a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	368 $ hg add a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	369 $ for i in 1 2 3; do echo $i > a; hg commit -m "a $i"; done
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	370 $ hg checkout 0
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	371 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	372 $ touch b
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	373 $ hg add b
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	374 $ for i in 1 2 3; do echo $i > b; hg commit -m "b $i"; done
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	375 created new head
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	376 $ hg log -G -T '{rev}:{node} {desc}' --hidden
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	377 @ 5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	378 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	379 o 4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	380 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	381 o 3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	382 \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	383 \| o 2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	384 \| \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	385 \| o 1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	386 \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	387 o 0:ea4e33293d4d274a2ba73150733c2612231f398c a 1
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	388
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	389
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	390 Add and expect uncommit to fail on both merge working dir and merge changeset
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	391
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	392 $ hg merge 2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	393 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	394 (branch merge, don't forget to commit)
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	395
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	396 $ hg uncommit
34284 624c53e4121d uncommit: don't allow bare uncommit on dirty working directory Pulkit Goyal <7895pulkit@gmail.com> parents: 34283 diff changeset	397 abort: outstanding uncommitted merge
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	398 (requires experimental.uncommitondirtywdir to uncommit)
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	399 [255]
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	400
34304 ae510d9691ef uncommit: add a test for uncommit with uncommitondirtywdir config in merge Pulkit Goyal <7895pulkit@gmail.com> parents: 34285 diff changeset	401 $ hg uncommit --config experimental.uncommitondirtywdir=True
ae510d9691ef uncommit: add a test for uncommit with uncommitondirtywdir config in merge Pulkit Goyal <7895pulkit@gmail.com> parents: 34285 diff changeset	402 abort: cannot uncommit while merging
ae510d9691ef uncommit: add a test for uncommit with uncommitondirtywdir config in merge Pulkit Goyal <7895pulkit@gmail.com> parents: 34285 diff changeset	403 [255]
ae510d9691ef uncommit: add a test for uncommit with uncommitondirtywdir config in merge Pulkit Goyal <7895pulkit@gmail.com> parents: 34285 diff changeset	404
34192 da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	405 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	406 M a
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	407 $ hg commit -m 'merge a and b'
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	408
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	409 $ hg uncommit
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	410 abort: cannot uncommit merge changeset
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	411 [255]
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	412
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	413 $ hg status
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	414 $ hg log -G -T '{rev}:{node} {desc}' --hidden
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	415 @ 6:c03b9c37bc67bf504d4912061cfb527b47a63c6e merge a and b
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	416 \|\
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	417 \| o 5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	418 \| \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	419 \| o 4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	420 \| \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	421 \| o 3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	422 \| \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	423 o \| 2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	424 \| \|
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	425 o \| 1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	426 \|/
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	427 o 0:ea4e33293d4d274a2ba73150733c2612231f398c a 1
da2f5f19312c uncommit: move fb-extension to core which uncommits a changeset Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	428
41338 c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	429
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	430 Rename a->b, then remove b in working copy. Result should remove a.
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	431
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	432 $ hg co -q 0
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	433 $ hg mv a b
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	434 $ hg ci -qm 'move a to b'
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	435 $ hg rm b
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	436 $ hg uncommit --config experimental.uncommitondirtywdir=True
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	437 $ hg st --copies
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	438 R a
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	439 $ hg revert a
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	440
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	441 Rename a->b, then rename b->c in working copy. Result should rename a->c.
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	442
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	443 $ hg co -q 0
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	444 $ hg mv a b
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	445 $ hg ci -qm 'move a to b'
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	446 $ hg mv b c
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	447 $ hg uncommit --config experimental.uncommitondirtywdir=True
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	448 $ hg st --copies
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	449 A c
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	450 a
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	451 R a
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	452 $ hg revert a
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	453 $ hg forget c
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	454 $ rm c
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	455
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	456 Copy a->b1 and a->b2, then rename b1->c in working copy. Result should copy a->b2 and a->c.
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	457
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	458 $ hg co -q 0
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	459 $ hg cp a b1
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	460 $ hg cp a b2
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	461 $ hg ci -qm 'move a to b1 and b2'
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	462 $ hg mv b1 c
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	463 $ hg uncommit --config experimental.uncommitondirtywdir=True
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	464 $ hg st --copies
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	465 A b2
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	466 a
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	467 A c
c7d425f7f5c9 tests: add more tests of uncommit/unamend with copies Martin von Zweigbergk <martinvonz@google.com> parents: 41010 diff changeset	468 a
41859 bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	469 $ cd ..
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	470
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	471 experimental.uncommitondirtywdir should also work on a dirty PATH
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	472
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	473 $ hg init issue5977
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	474 $ cd issue5977
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	475 $ echo 'super critical info!' > a
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	476 $ hg ci -Am 'add a'
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	477 adding a
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	478 $ echo 'foo' > b
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	479 $ hg add b
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	480 $ hg status
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	481 A b
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	482 $ hg unc a
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	483 note: keeping empty commit
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	484 $ hg unc b
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	485 abort: uncommitted changes
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	486 (requires experimental.uncommitondirtywdir to uncommit)
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	487 [255]
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	488 $ cat a
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	489 super critical info!
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	490 $ hg log
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	491 changeset: 1:656ba143d384
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	492 tag: tip
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	493 parent: -1:000000000000
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	494 user: test
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	495 date: Thu Jan 01 00:00:00 1970 +0000
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	496 summary: add a
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	497
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	498 $ hg ci -Am 'add b'
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	499 $ echo 'foo bar' > b
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	500 $ hg unc --config experimental.uncommitondirtywdir=True b
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	501 $ hg log
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	502 changeset: 3:30fa958635b2
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	503 tag: tip
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	504 parent: 1:656ba143d384
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	505 user: test
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	506 date: Thu Jan 01 00:00:00 1970 +0000
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	507 summary: add b
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	508
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	509 changeset: 1:656ba143d384
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	510 parent: -1:000000000000
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	511 user: test
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	512 date: Thu Jan 01 00:00:00 1970 +0000
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	513 summary: add a
bf22e370ae9a uncommit: don't allow dirty working copy with PATH (issue5977) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 41750 diff changeset	514

Mercurial > public > mercurial-scm > hg

annotate tests/test-uncommit.t @ 41859:bf22e370ae9a