Mercurial > hg
view tests/test-merge9 @ 9092:9aebeea7ac00
subrepo: use hg.repository instead of creating localrepo directly
this way, extensions' reposetup will be called, which allows for git
subrepos to be handled by hg-git (and I believe the same goes for
svn and hgsubversion)
author | Abderrahim Kitouni <a.kitouni@gmail.com> |
---|---|
date | Sat, 04 Jul 2009 14:18:15 +0100 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh # test that we don't interrupt the merge session if # a file-level merge failed hg init repo cd repo echo foo > foo echo a > bar hg ci -Am 'add foo' hg mv foo baz echo b >> bar echo quux > quux1 hg ci -Am 'mv foo baz' hg up -qC 0 echo >> foo echo c >> bar echo quux > quux2 hg ci -Am 'change foo' # test with the rename on the remote side HGMERGE=false hg merge hg resolve -l # test with the rename on the local side hg up -C 1 HGMERGE=false hg merge echo % show unresolved hg resolve -l echo % unmark baz hg resolve -u baz echo % show hg resolve -l hg st echo % re-resolve baz hg resolve baz echo % after hg resolve -l echo % resolve all warning hg resolve echo % resolve all hg resolve -a echo % after hg resolve -l true