Mercurial > hg
view tests/test-double-merge @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | 99a4592ea886 |
children | 50b6af595e0c |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo line 1 > foo hg ci -qAm 'add foo' -d "1000000 0" # copy foo to bar and change both files hg cp foo bar echo line 2-1 >> foo echo line 2-2 >> bar hg ci -m 'cp foo bar; change both' -d "1000000 0" # in another branch, change foo in a way that doesn't conflict with # the other changes hg up -qC 0 echo line 0 > foo hg cat foo >> foo hg ci -m 'change foo' -d "1000000 0" # we get conflicts that shouldn't be there hg merge --debug echo "-- foo --" cat foo echo "-- bar --" cat bar