mercurial: tests/test-merge-tools.t@30cfa286947c (annotated)

12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	1	test merge-tools configuration - mostly exercising filemerge.py
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	3	$ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	4	$ hg init
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	5
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	6	revision 0
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	7
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	8	$ echo "revision 0" > f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	9	$ echo "space" >> f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	10	$ hg commit -Am "revision 0"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	11	adding f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	12
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	13	revision 1
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	14
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	15	$ echo "revision 1" > f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	16	$ echo "space" >> f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	17	$ hg commit -Am "revision 1"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	18	$ hg update 0 > /dev/null
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	19
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	20	revision 2
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	21
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	22	$ echo "revision 2" > f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	23	$ echo "space" >> f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	24	$ hg commit -Am "revision 2"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	25	created new head
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	26	$ hg update 0 > /dev/null
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	27
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	28	revision 3 - simple to merge
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	29
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	30	$ echo "revision 3" >> f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	31	$ hg commit -Am "revision 3"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	32	created new head
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	33	$ echo "[merge-tools]" > .hg/hgrc
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	34
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	35	$ beforemerge() {
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	36	> cat .hg/hgrc
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	37	> echo "# hg update -C 1"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	38	> hg update -C 1 > /dev/null
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	39	> }
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	40	$ aftermerge() {
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	41	> echo "# cat f"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	42	> cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	43	> echo "# hg stat"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	44	> hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	45	> rm -f f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	46	> }
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	47
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	48	Tool selection
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	49
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	50	default is internal merge:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	51
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	52	$ beforemerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	53	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	54	# hg update -C 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	55
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	56	hg merge -r 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	57	override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	58	running from a devel copy, not a temp installation
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	59
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	60	$ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	61	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	62	warning: conflicts during merge.
15501 2371f4aea665 merge: give a special message for internal:merge failure (issue3105) Matt Mackall <mpm@selenic.com> parents: 15264 diff changeset	63	merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	64	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	65	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	66	[1]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	67	$ aftermerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	68	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	69	<<<<<<< local
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	70	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	71	=======
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	72	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	73	>>>>>>> other
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	74	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	75	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	76	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	77	? f.orig
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	78
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	79	simplest hgrc using false for merge:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	80
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	81	$ echo "false.whatever=" >> .hg/hgrc
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	82	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	83	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	84	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	85	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	86	$ hg merge -r 2
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	87	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	88	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	89	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	90	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	91	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	92	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	93	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	94	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	95	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	96	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	97	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	98	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	99
15545 2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	100	unexecutable file in $PATH shouldn't be found:
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	101
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	102	$ touch false
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	103	$ hg up -qC 1
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	104	$ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	105	merging f
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	106	warning: conflicts during merge.
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	107	merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	108	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	109	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	110	[1]
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	111	$ rm false
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	112
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	113	executable directory in $PATH shouldn't be found:
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	114
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	115	$ mkdir false
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	116	$ hg up -qC 1
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	117	$ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	118	merging f
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	119	warning: conflicts during merge.
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	120	merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	121	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	122	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	123	[1]
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	124	$ rmdir false
2607de602105 tests: test findexe() access check fixed in 58f96703a9ab Mads Kiilerich <mads@kiilerich.com> parents: 15524 diff changeset	125
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	126	true with higher .priority gets precedence:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	127
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	128	$ echo "true.priority=1" >> .hg/hgrc
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	129	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	130	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	131	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	132	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	133	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	134	$ hg merge -r 2
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	135	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	136	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	137	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	138	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	139	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	140	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	141	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	142	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	143	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	144
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	145	unless lowered on command line:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	146
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	147	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	148	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	149	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	150	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	151	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	152	$ hg merge -r 2 --config merge-tools.true.priority=-7
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	153	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	154	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	155	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	156	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	157	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	158	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	159	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	160	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	161	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	162	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	163	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	164	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	165
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	166	or false set higher on command line:
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	167
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	168	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	169	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	170	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	171	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	172	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	173	$ hg merge -r 2 --config merge-tools.false.priority=117
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	174	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	175	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	176	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	177	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	178	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	179	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	180	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	181	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	182	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	183	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	184	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	185	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	186
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	187	or true.executable not found in PATH:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	188
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	189	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	190	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	191	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	192	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	193	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	194	$ hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	195	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	196	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	197	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	198	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	199	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	200	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	201	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	202	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	203	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	204	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	205	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	206	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	207
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	208	or true.executable with bogus path:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	209
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	210	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	211	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	212	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	213	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	214	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	215	$ hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	216	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	217	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	218	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	219	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	220	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	221	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	222	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	223	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	224	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	225	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	226	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	227	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	228
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	229	but true.executable set to cat found in PATH works:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	230
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	231	$ echo "true.executable=cat" >> .hg/hgrc
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	232	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	233	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	234	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	235	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	236	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	237	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	238	$ hg merge -r 2
13439 d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 12788 diff changeset	239	merging f
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	240	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	241	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	242	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	243	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	244	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	245	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	246	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	247	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	248	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	249	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	250	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	251	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	252	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	253	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	254
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	255	and true.executable set to cat with path works:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	256
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	257	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	258	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	259	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	260	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	261	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	262	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	263	$ hg merge -r 2 --config merge-tools.true.executable=cat
13439 d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 12788 diff changeset	264	merging f
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	265	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	266	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	267	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	268	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	269	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	270	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	271	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	272	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	273	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	274	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	275	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	276	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	277	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	278	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	279
15264 157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	280	environment variables in true.executable are handled:
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	281
16967 30cfa286947c test-merge-tools: adapt for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16961 diff changeset	282	$ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh"
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	283	$ beforemerge
15264 157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	284	[merge-tools]
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	285	false.whatever=
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	286	true.priority=1
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	287	true.executable=cat
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	288	# hg update -C 1
16967 30cfa286947c test-merge-tools: adapt for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16961 diff changeset	289	$ hg --config merge-tools.true.executable='sh' \
30cfa286947c test-merge-tools: adapt for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16961 diff changeset	290	> --config merge-tools.true.args="$HGTMP/merge.sh" \
30cfa286947c test-merge-tools: adapt for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16961 diff changeset	291	> merge -r 2
15264 157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	292	merging f
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	293	custom merge tool
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	294	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	295	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	296	$ aftermerge
15264 157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	297	# cat f
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	298	revision 1
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	299	space
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	300	# hg stat
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	301	M f
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 15243 diff changeset	302
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	303	Tool selection and merge-patterns
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	304
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	305	merge-patterns specifies new tool false:
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	306
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	307	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	308	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	309	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	310	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	311	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	312	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	313	$ hg merge -r 2 --config merge-patterns.f=false
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	314	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	315	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	316	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	317	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	318	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	319	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	320	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	321	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	322	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	323	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	324	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	325	? f.orig
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	326
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	327	merge-patterns specifies executable not found in PATH and gets warning:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	328
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	329	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	330	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	331	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	332	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	333	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	334	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	335	$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	336	couldn't find merge tool true specified for f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	337	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	338	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	339	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	340	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	341	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	342	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	343	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	344	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	345	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	346	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	347	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	348	? f.orig
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	349
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	350	merge-patterns specifies executable with bogus path and gets warning:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	351
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	352	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	353	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	354	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	355	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	356	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	357	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	358	$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	359	couldn't find merge tool true specified for f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	360	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	361	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	362	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	363	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	364	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	365	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	366	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	367	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	368	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	369	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	370	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	371	? f.orig
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	372
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	373	ui.merge overrules priority
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	374
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	375	ui.merge specifies false:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	376
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	377	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	378	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	379	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	380	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	381	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	382	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	383	$ hg merge -r 2 --config ui.merge=false
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	384	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	385	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	386	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	387	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	388	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	389	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	390	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	391	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	392	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	393	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	394	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	395	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	396
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	397	ui.merge specifies internal:fail:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	398
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	399	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	400	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	401	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	402	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	403	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	404	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	405	$ hg merge -r 2 --config ui.merge=internal:fail
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	406	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	407	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	408	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	409	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	410	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	411	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	412	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	413	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	414	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	415
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	416	ui.merge specifies internal:local:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	417
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	418	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	419	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	420	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	421	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	422	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	423	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	424	$ hg merge -r 2 --config ui.merge=internal:local
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	425	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	426	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	427	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	428	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	429	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	430	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	431	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	432	M f
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	433
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	434	ui.merge specifies internal:other:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	435
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	436	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	437	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	438	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	439	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	440	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	441	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	442	$ hg merge -r 2 --config ui.merge=internal:other
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	443	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	444	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	445	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	446	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	447	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	448	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	449	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	450	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	451
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	452	ui.merge specifies internal:prompt:
7846 1cb6836946be test-merge-tools: test ui.merge functionality and selection of internal tools Mads Kiilerich <mads@kiilerich.com> parents: 7785 diff changeset	453
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	454	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	455	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	456	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	457	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	458	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	459	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	460	$ hg merge -r 2 --config ui.merge=internal:prompt
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	461	no tool found to merge f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	462	keep (l)ocal or take (o)ther? l
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	463	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	464	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	465	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	466	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	467	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	468	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	469	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	470	M f
7846 1cb6836946be test-merge-tools: test ui.merge functionality and selection of internal tools Mads Kiilerich <mads@kiilerich.com> parents: 7785 diff changeset	471
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	472	ui.merge specifies internal:dump:
7846 1cb6836946be test-merge-tools: test ui.merge functionality and selection of internal tools Mads Kiilerich <mads@kiilerich.com> parents: 7785 diff changeset	473
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	474	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	475	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	476	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	477	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	478	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	479	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	480	$ hg merge -r 2 --config ui.merge=internal:dump
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	481	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	482	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	483	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	484	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	485	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	486	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	487	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	488	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	489	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	490	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	491	? f.base
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	492	? f.local
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	493	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	494	? f.other
7846 1cb6836946be test-merge-tools: test ui.merge functionality and selection of internal tools Mads Kiilerich <mads@kiilerich.com> parents: 7785 diff changeset	495
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	496	f.base:
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	497
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	498	$ cat f.base
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	499	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	500	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	501
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	502	f.local:
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	503
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	504	$ cat f.local
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	505	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	506	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	507
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	508	f.other:
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	509
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	510	$ cat f.other
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	511	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	512	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	513	$ rm f.base f.local f.other
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	514
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	515	ui.merge specifies internal:other but is overruled by pattern for false:
8901 94319ae527cf test merge-tools internal:dump and internal:prompt Mads Kiilerich <mads@kiilerich.com> parents: 8674 diff changeset	516
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	517	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	518	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	519	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	520	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	521	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	522	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	523	$ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	524	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	525	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	526	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	527	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	528	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	529	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	530	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	531	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	532	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	533	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	534	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	535	? f.orig
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	536
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	537	Premerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	538
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	539	ui.merge specifies internal:other but is overruled by --tool=false
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	540
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	541	$ beforemerge
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	542	[merge-tools]
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	543	false.whatever=
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	544	true.priority=1
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	545	true.executable=cat
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	546	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	547	$ hg merge -r 2 --config ui.merge=internal:other --tool=false
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	548	merging f
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	549	merging f failed!
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	550	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	551	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	552	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	553	$ aftermerge
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	554	# cat f
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	555	revision 1
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	556	space
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	557	# hg stat
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	558	M f
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	559	? f.orig
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	560
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	561	HGMERGE specifies internal:other but is overruled by --tool=false
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	562
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	563	$ HGMERGE=internal:other ; export HGMERGE
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	564	$ beforemerge
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	565	[merge-tools]
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	566	false.whatever=
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	567	true.priority=1
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	568	true.executable=cat
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	569	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	570	$ hg merge -r 2 --tool=false
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	571	merging f
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	572	merging f failed!
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	573	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	574	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	575	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	576	$ aftermerge
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	577	# cat f
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	578	revision 1
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	579	space
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	580	# hg stat
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	581	M f
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	582	? f.orig
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	583
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	584	$ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12460 diff changeset	585
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	586	Default is silent simplemerge:
8901 94319ae527cf test merge-tools internal:dump and internal:prompt Mads Kiilerich <mads@kiilerich.com> parents: 8674 diff changeset	587
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	588	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	589	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	590	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	591	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	592	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	593	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	594	$ hg merge -r 3
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	595	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	596	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	597	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	598	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	599	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	600	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	601	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	602	revision 3
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	603	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	604	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	605
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	606	.premerge=True is same:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	607
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	608	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	609	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	610	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	611	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	612	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	613	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	614	$ hg merge -r 3 --config merge-tools.true.premerge=True
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	615	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	616	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	617	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	618	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	619	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	620	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	621	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	622	revision 3
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	623	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	624	M f
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	625
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	626	.premerge=False executes merge-tool:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	627
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	628	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	629	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	630	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	631	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	632	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	633	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	634	$ hg merge -r 3 --config merge-tools.true.premerge=False
13439 d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 12788 diff changeset	635	merging f
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	636	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	637	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	638	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	639	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	640	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	641	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	642	revision 3
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	643	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	644	(branch merge, don't forget to commit)
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	645	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	646	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	647	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	648	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	649	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	650	M f
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	651
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	652	Tool execution
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	653
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	654	set tools.args explicit to include $base $local $other $output:
1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	655
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	656	$ beforemerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	657	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	658	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	659	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	660	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	661	# hg update -C 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	662	$ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	663	> \| sed 's,==> .* <==,==> ... <==,g'
13439 d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 12788 diff changeset	664	merging f
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	665	==> ... <==
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	666	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	667	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	668
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	669	==> ... <==
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	670	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	671	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	672
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	673	==> ... <==
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	674	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	675	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	676
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	677	==> ... <==
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	678	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	679	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	680	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	681	(branch merge, don't forget to commit)
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	682	$ aftermerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	683	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	684	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	685	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	686	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	687	M f
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	688
1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	689	Merge with "echo mergeresult > $local":
1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	690
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	691	$ beforemerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	692	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	693	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	694	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	695	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	696	# hg update -C 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	697	$ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local'
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	698	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	699	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	700	(branch merge, don't forget to commit)
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	701	$ aftermerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	702	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	703	mergeresult
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	704	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	705	M f
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	706
1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	707	- and $local is the file f:
1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	708
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	709	$ beforemerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	710	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	711	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	712	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	713	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	714	# hg update -C 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	715	$ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f'
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	716	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	717	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	718	(branch merge, don't forget to commit)
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	719	$ aftermerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	720	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	721	mergeresult
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	722	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	723	M f
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	724
1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	725	Merge with "echo mergeresult > $output" - the variable is a bit magic:
1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13439 diff changeset	726
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	727	$ beforemerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	728	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	729	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	730	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	731	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	732	# hg update -C 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	733	$ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output'
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	734	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	735	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	736	(branch merge, don't forget to commit)
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	737	$ aftermerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	738	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	739	mergeresult
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	740	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	741	M f
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	742
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	743	Merge using tool with a path that must be quoted:
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	744
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	745	$ beforemerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	746	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	747	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	748	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	749	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	750	# hg update -C 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	751	$ cat <<EOF > 'my merge tool'
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	752	> cat "\$1" "\$2" "\$3" > "\$4"
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	753	> EOF
16967 30cfa286947c test-merge-tools: adapt for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16961 diff changeset	754	$ hg --config merge-tools.true.executable='sh' \
30cfa286947c test-merge-tools: adapt for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16961 diff changeset	755	> --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \
30cfa286947c test-merge-tools: adapt for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16961 diff changeset	756	> merge -r 2
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	757	merging f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	758	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	759	(branch merge, don't forget to commit)
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	760	$ rm -f 'my merge tool'
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	761	$ aftermerge
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	762	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	763	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	764	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	765	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	766	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	767	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	768	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	769	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	770	M f
10775 c52057614c72 Tests with spaces in paths Mads Kiilerich <mads@kiilerich.com> parents: 10282 diff changeset	771
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	772	Merge post-processing
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	773
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	774	cat is a bad merge-tool and doesn't change:
7731 737f274d1915 test-merge-tools Mads Kiilerich <mads@kiilerich.com> parents: diff changeset	775
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	776	$ beforemerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	777	[merge-tools]
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	778	false.whatever=
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	779	true.priority=1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	780	true.executable=cat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	781	# hg update -C 1
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	782	$ hg merge -y -r 2 --config merge-tools.true.checkchanged=1
13439 d724a69309e0 util: flush stdout before calling external processes Mads Kiilerich <mads@kiilerich.com> parents: 12788 diff changeset	783	merging f
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	784	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	785	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	786	revision 0
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	787	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	788	revision 2
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	789	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	790	output file f appears unchanged
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	791	was merge successful (yn)? n
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	792	merging f failed!
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	793	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	794	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
16961 cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	795	[1]
cdbb53a640c1 test-merge-tools: inline pointless domerge function Adrian Buehlmann <adrian@cadifra.com> parents: 15545 diff changeset	796	$ aftermerge
12460 09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	797	# cat f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	798	revision 1
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	799	space
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	800	# hg stat
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	801	M f
09168638b313 tests: unify test-merge-tools Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	802	? f.orig

author	Adrian Buehlmann <adrian@cadifra.com>
	Fri, 15 Jun 2012 17:32:33 +0200
changeset 16967	30cfa286947c
parent 16961	cdbb53a640c1
child 16972	5efe9c6a34fe
permissions	-rw-r--r--