Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge1 @ 3257:c93ce7f10f85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 19:08:04 -0500
parents c82ea81d6850
children 764688cf51e5
comparison
equal deleted inserted replaced
3256:7c114915fbdb 3257:c93ce7f10f85
1 #!/bin/sh 1 #!/bin/sh
2 2
3 mkdir t 3 mkdir t
4 cd t 4 cd t
5 hg init 5 hg init
6 echo "[merge]" >> .hg/hgrc
7 echo "followcopies = 1" >> .hg/hgrc
6 echo foo > a 8 echo foo > a
7 echo foo > a2 9 echo foo > a2
8 hg add a a2 10 hg add a a2
9 hg ci -m "start" -d "0 0" 11 hg ci -m "start" -d "0 0"
10 hg mv a b 12 hg mv a b
16 echo blahblah > a2 18 echo blahblah > a2
17 hg mv a2 c2 19 hg mv a2 c2
18 hg ci -m "modify" -d "0 0" 20 hg ci -m "modify" -d "0 0"
19 echo "merge" 21 echo "merge"
20 hg merge -y --debug 22 hg merge -y --debug
21 cat a 23 hg status -AC
22 cat b 24 cat b
23 hg ci -m "merge" -d "0 0" 25 hg ci -m "merge" -d "0 0"