Mercurial > hg

comparison tests/test-double-merge @ 5148:06154aff2b1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 08 Aug 2007 23:00:01 +0200
parents 99a4592ea886
children 50b6af595e0c
comparison
equal deleted inserted replaced
5083:f94dbc6c7eaf 5148:06154aff2b1a
13 hg ci -m 'cp foo bar; change both' -d "1000000 0" 13 hg ci -m 'cp foo bar; change both' -d "1000000 0"
14 14
15 # in another branch, change foo in a way that doesn't conflict with 15 # in another branch, change foo in a way that doesn't conflict with
16 # the other changes 16 # the other changes
17 hg up -qC 0 17 hg up -qC 0
18 echo line 0 >| foo 18 echo line 0 > foo
19 hg cat foo >> foo 19 hg cat foo >> foo
20 hg ci -m 'change foo' -d "1000000 0" 20 hg ci -m 'change foo' -d "1000000 0"
21 21
22 # we get conflicts that shouldn't be there 22 # we get conflicts that shouldn't be there
23 hg merge --debug 23 hg merge --debug