Mercurial > hg

comparison tests/test-rename-dir-merge @ 5629:1db1c7c1eb5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 07 Dec 2007 21:46:08 -0800
parents 56e9f7b2d8fa
children 6c82beaaa11a
comparison
equal deleted inserted replaced
5628:71179daf6941 5629:1db1c7c1eb5e
5 hg init 5 hg init
6 6
7 mkdir a 7 mkdir a
8 echo foo > a/a 8 echo foo > a/a
9 echo bar > a/b 9 echo bar > a/b
10 10 hg ci -Am "0" -d "0 0"
11 hg add a
12 hg ci -m "0" -d "0 0"
13 11
14 hg co -C 0 12 hg co -C 0
15 hg mv a b 13 hg mv a b
16 hg ci -m "1 mv a/ b/" -d "0 0" 14 hg ci -m "1 mv a/ b/" -d "0 0"
17 15
18 hg co -C 0 16 hg co -C 0
19 echo baz > a/c 17 echo baz > a/c
18 echo quux > a/d
20 hg add a/c 19 hg add a/c
21 hg ci -m "2 add a/c" -d "0 0" 20 hg ci -m "2 add a/c" -d "0 0"
22 21
23 hg merge --debug 1 22 hg merge --debug 1
24 echo a/* b/* 23 echo a/* b/*