mercurial: tests/test-merge-remove.t@865efc020c33 (annotated)

49621 55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47989 diff changeset	1	$ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47989 diff changeset	2	$ cd repo
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	3
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	4	$ echo foo > foo
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	5	$ echo bar > bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	6	$ hg ci -qAm 'add foo bar'
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	7
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	8	$ echo foo2 >> foo
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	9	$ echo bleh > bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	10	$ hg ci -m 'change foo bar'
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	11
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	12	$ hg up -qC 0
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	13	$ hg mv foo foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	14	$ echo foo1 > foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	15	$ hg cat foo >> foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	16	$ hg ci -m 'mv foo foo1'
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	17	created new head
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	18
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	19	$ hg merge
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	20	merging foo1 and foo to foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	21	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	22	(branch merge, don't forget to commit)
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	23
39760 7e99b02768ef debugdirstate: deprecate --nodates in favor of --no-dates Martin von Zweigbergk <martinvonz@google.com> parents: 39405 diff changeset	24	$ hg debugstate --no-dates
23840 ddc17eaf0f1b debugdirstate: don't hide date field with --nodate, just show 'set'/'unset' Mads Kiilerich <madski@unity3d.com> parents: 22897 diff changeset	25	m 0 -2 unset bar
ddc17eaf0f1b debugdirstate: don't hide date field with --nodate, just show 'set'/'unset' Mads Kiilerich <madski@unity3d.com> parents: 22897 diff changeset	26	m 0 -2 unset foo1
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	27	copy: foo -> foo1
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	28
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	29	$ hg st -q
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	30	M bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	31	M foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	32
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	33
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	34	Removing foo1 and bar:
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	35
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	36	$ cp foo1 F
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	37	$ cp bar B
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	38	$ hg rm -f foo1 bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	39
39760 7e99b02768ef debugdirstate: deprecate --nodates in favor of --no-dates Martin von Zweigbergk <martinvonz@google.com> parents: 39405 diff changeset	40	$ hg debugstate --no-dates
23840 ddc17eaf0f1b debugdirstate: don't hide date field with --nodate, just show 'set'/'unset' Mads Kiilerich <madski@unity3d.com> parents: 22897 diff changeset	41	r 0 -1 set bar
ddc17eaf0f1b debugdirstate: don't hide date field with --nodate, just show 'set'/'unset' Mads Kiilerich <madski@unity3d.com> parents: 22897 diff changeset	42	r 0 -1 set foo1
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	43	copy: foo -> foo1
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	44
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	45	$ hg st -qC
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	46	R bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	47	R foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	48
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	49
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	50	Re-adding foo1 and bar:
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	51
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	52	$ cp F foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	53	$ cp B bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	54	$ hg add -v foo1 bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	55	adding bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	56	adding foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	57
39760 7e99b02768ef debugdirstate: deprecate --nodates in favor of --no-dates Martin von Zweigbergk <martinvonz@google.com> parents: 39405 diff changeset	58	$ hg debugstate --no-dates
47989 87b3010c08e0 dirstate: fix restoration of "merged" state after a remove Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46418 diff changeset	59	m 0 -2 unset bar
87b3010c08e0 dirstate: fix restoration of "merged" state after a remove Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46418 diff changeset	60	m 0 -2 unset foo1
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	61	copy: foo -> foo1
6298 53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	62
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	63	$ hg st -qC
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	64	M bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	65	M foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	66	foo
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	67
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	68
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	69	Reverting foo1 and bar:
6299 653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	70
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	71	$ hg revert -vr . foo1 bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	72	saving current version of bar as bar.orig
39405 cb70501d8b71 revert: fix the inconsistency of status msgs in --interactive mode Sushil khanchi <sushilkhanchi97@gmail.com> parents: 39285 diff changeset	73	saving current version of foo1 as foo1.orig
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	74	reverting bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	75	reverting foo1
6299 653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	76
39760 7e99b02768ef debugdirstate: deprecate --nodates in favor of --no-dates Martin von Zweigbergk <martinvonz@google.com> parents: 39405 diff changeset	77	$ hg debugstate --no-dates
47989 87b3010c08e0 dirstate: fix restoration of "merged" state after a remove Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46418 diff changeset	78	m 0 -2 unset bar
87b3010c08e0 dirstate: fix restoration of "merged" state after a remove Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46418 diff changeset	79	m 0 -2 unset foo1
12260 0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	80	copy: foo -> foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	81
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	82	$ hg st -qC
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	83	M bar
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	84	M foo1
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	85	foo
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	86
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	87	$ hg diff
0a63e91c519d tests: unify test-merge-remove Adrian Buehlmann <adrian@cadifra.com> parents: 6299 diff changeset	88
20415 e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	89	Merge should not overwrite local file that is untracked after remove
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	90
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	91	$ rm *
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	92	$ hg up -qC
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	93	$ hg rm bar
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	94	$ hg ci -m 'remove bar'
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	95	$ echo 'memories of buried pirate treasure' > bar
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	96	$ hg merge
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	97	bar: untracked file differs
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	98	abort: untracked files in working directory differ from files in requested revision
46418 dc00324e80f4 errors: use StateError more in merge module Martin von Zweigbergk <martinvonz@google.com> parents: 42565 diff changeset	99	[20]
20415 e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	100	$ cat bar
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	101	memories of buried pirate treasure
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	102
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	103	Those who use force will lose
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	104
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	105	$ hg merge -f
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	106	file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
42565 4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 39760 diff changeset	107	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 39760 diff changeset	108	What do you want to do? u
20415 e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	109	merging foo1 and foo to foo1
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	110	0 files updated, 1 files merged, 0 files removed, 1 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 30062 diff changeset	111	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	112	[1]
20415 e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	113	$ cat bar
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	114	bleh
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	115	$ hg st
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	116	M bar
e4d7cbc94219 merge: don't overwrite file untracked after remove, abort with 'untracked files' Mads Kiilerich <madski@unity3d.com> parents: 12260 diff changeset	117	M foo1

author	Arseniy Alekseyev <aalekseyev@janestreet.com>
	Fri, 26 Apr 2024 19:10:35 +0100
changeset 51626	865efc020c33
parent 49621	55c6ebd11cb9
permissions	-rw-r--r--