hg-stable: tests/test-revert-unknown.t@20096384754f (annotated)

mq: update subrepos when applying / unapplying patches that change .hgsubstate Up until now applying or unapplying a patch that modified .hgsubstate would not work as expected because it would not update the subrepos according to the .hgsubstate change. This made it very easy to lose subrepo changes when using mq. This revision also changes the test-mq-subrepo test so that on the qpop / qpush tests. We no longer use the debugsub command to check the state of the subrepos after the qpop and qpush operations. Instead we directly run the id command on the subrepos that we want to check. The reason is that using the debugsub command is misleading because it does not really check the state of the subrepos on the working directory (it just returns what the change that is specified on a given revision). Because of this the tests did not detect the problem that this revision fixes (i.e. that applying a patch did not update the subrepos to the corresponding revisions). # HG changeset patch # User Angel Ezquerra <angel.ezquerra@gmail.com> # Date 1376350710 -7200 # Tue Aug 13 01:38:30 2013 +0200 # Node ID 60897e264858cdcd46f89e27a702086f08adca02 # Parent 2defb5453f223c3027eb2f7788fbddd52bbb3352 mq: update subrepos when applying / unapplying patches that change .hgsubstate Up until now applying or unapplying a patch that modified .hgsubstate would not work as expected because it would not update the subrepos according to the .hgsubstate change. This made it very easy to lose subrepo changes when using mq. This revision also changes the test-mq-subrepo test so that on the qpop / qpush tests. We no longer use the debugsub command to check the state of the subrepos after the qpop and qpush operations. Instead we directly run the id command on the subrepos that we want to check. The reason is that using the debugsub command is misleading because it does not really check the state of the subrepos on the working directory (it just returns what the change that is specified on a given revision). Because of this the tests did not detect the problem that this revision fixes (i.e. that applying a patch did not update the subrepos to the corresponding revisions).

12111 327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	1	$ hg init
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	2	$ touch unknown
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	3
12111 327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	4	$ touch a
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	5	$ hg add a
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 12111 diff changeset	6	$ hg ci -m "1"
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	7
12111 327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	8	$ touch b
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	9	$ hg add b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 12111 diff changeset	10	$ hg ci -m "2"
12111 327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	11
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	12	Should show unknown
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	13
12111 327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	14	$ hg status
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	15	? unknown
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	16	$ hg revert -r 0 --all
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	17	removing b
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	18
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	19	Should show unknown and b removed
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: diff changeset	20
12111 327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	21	$ hg status
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	22	R b
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	23	? unknown
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	24
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	25	Should show a and unknown
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	26
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	27	$ ls
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	28	a
327dee7f7327 tests: unify test-revert-unknown Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 2982 diff changeset	29	unknown

author	Angel Ezquerra <angel.ezquerra@gmail.com>
	Tue, 13 Aug 2013 01:38:30 +0200
changeset 19638	20096384754f
parent 12156	4c94b6d0fb1c
child 44724	5c2a4f37eace
permissions	-rw-r--r--