Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-dir-merge @ 3733:9e67fecbfd16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: handle directory renames commit: handle new copy dirstate case correctly findcopies: keep a map of all copies found for directory logic add dirs filter check for merge:followdirs config option generate a directory move map find files that match directory move map manifestmerge: add directory rename cases applyupdates: skip actions with None file add "d" action recordupdates: add "d" action add simple directory rename test
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
parents
children 216e75c721d3
comparison
equal deleted inserted replaced
3732:ffe9fef84801 3733:9e67fecbfd16
1 #!/bin/sh
2
3 mkdir t
4 cd t
5 hg init
6
7 mkdir a
8 echo foo > a/a
9 echo bar > a/b
10
11 hg add a
12 hg ci -m "0" -d "0 0"
13
14 hg co -C 0
15 hg mv a b
16 hg ci -m "1 mv a/ b/" -d "0 0"
17
18 hg co -C 0
19 echo baz > a/c
20 hg add a/c
21 hg ci -m "2 add a/c" -d "0 0"
22
23 hg merge --debug 1
24 ls a/ b/
25 hg st -C
26 hg ci -m "3 merge 2+1" -d "0 0"
27
28 hg co -C 1
29 hg merge --debug 2
30 ls a/ b/
31 hg st -C
32 hg ci -m "4 merge 1+2" -d "0 0"