Mercurial: tests/test-resolve@ea38a2c1bdd3 (annotated)

7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	1	#!/bin/sh
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	2
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	3	# test that a commit clears the merge state.
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	4
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	5	hg init repo
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	6	cd repo
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	7
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	8	echo foo > file
8167 6c82beaaa11a tests: removed redundant "-d '0 0'" from test scripts Martin Geisler <mg@lazybytes.net> parents: 7734 diff changeset	9	hg commit -Am 'add file'
7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	10
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	11	echo bar >> file
8167 6c82beaaa11a tests: removed redundant "-d '0 0'" from test scripts Martin Geisler <mg@lazybytes.net> parents: 7734 diff changeset	12	hg commit -Am 'append bar'
7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	13
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	14	echo % create a second head
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	15	hg up -C 0
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	16	echo baz >> file
8167 6c82beaaa11a tests: removed redundant "-d '0 0'" from test scripts Martin Geisler <mg@lazybytes.net> parents: 7734 diff changeset	17	hg commit -Am 'append baz'
7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	18
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	19	echo % failing merge
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	20	HGMERGE=internal:fail hg merge
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	21
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	22	echo resolved > file
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	23	hg resolve -m file
8167 6c82beaaa11a tests: removed redundant "-d '0 0'" from test scripts Martin Geisler <mg@lazybytes.net> parents: 7734 diff changeset	24	hg commit -m 'resolved'
7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	25
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	26	echo % resolve -l, should be empty
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	27	hg resolve -l

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
	Mon, 16 Nov 2009 11:55:29 +0100
changeset 9858	ea38a2c1bdd3
parent 8167	6c82beaaa11a
child 11451	51021f4c80b5
permissions	-rwxr-xr-x