Mercurial: tests/test-merge2.t@417f3c27983b (annotated)

11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	1	$ mkdir t
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	2	$ cd t
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	3	$ hg init
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	4	$ echo This is file a1 > a
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	5	$ hg add a
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	6	$ hg commit -m "commit #0"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	7	$ echo This is file b1 > b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	8	$ hg add b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	9	$ hg commit -m "commit #1"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	10	$ rm b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	11	$ hg update 0
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	12	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	13	$ echo This is file b2 > b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	14	$ hg add b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	15	$ hg commit -m "commit #2"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	16	created new head
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	17	$ cd ..; rm -r t
409 feadc9697b43 Pick up tests from previous patch mpm@selenic.com parents: diff changeset	18
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	19	$ mkdir t
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	20	$ cd t
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	21	$ hg init
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	22	$ echo This is file a1 > a
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	23	$ hg add a
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	24	$ hg commit -m "commit #0"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	25	$ echo This is file b1 > b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	26	$ hg add b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	27	$ hg commit -m "commit #1"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	28	$ rm b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	29	$ hg update 0
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	30	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	31	$ echo This is file b2 > b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	32	$ hg commit -A -m "commit #2"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	33	adding b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	34	created new head
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	35	$ cd ..; rm -r t
409 feadc9697b43 Pick up tests from previous patch mpm@selenic.com parents: diff changeset	36
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	37	$ mkdir t
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	38	$ cd t
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	39	$ hg init
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	40	$ echo This is file a1 > a
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	41	$ hg add a
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	42	$ hg commit -m "commit #0"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	43	$ echo This is file b1 > b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	44	$ hg add b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	45	$ hg commit -m "commit #1"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	46	$ rm b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	47	$ hg remove b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	48	$ hg update 0
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	49	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	50	$ echo This is file b2 > b
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11976 diff changeset	51	$ hg commit -A -m "commit #2"
11976 b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	52	adding b
b28fc3b3efd6 tests: unify test-merge2 Pradeepkumar Gayam <in3xes@gmail.com> parents: 3988 diff changeset	53	created new head

author	Matt Mackall <mpm@selenic.com>
	Mon, 15 Nov 2010 17:04:55 -0600
branch	stable
changeset 13000	417f3c27983b
parent 12156	4c94b6d0fb1c
child 13956	ffb5c09ba822
permissions	-rw-r--r--