% setup
hg init
hg add n1 dir/n2
hg add --bf
hg commit -m 'add files'
hg clone repo1 repo2
hg commit -m 'edit files'
% fetch
hg fetch ../repo1 -d '1 0' -m 'automated merge'
hg mv dir/n2 n2
hg mv dir/b2 b2
hg commit -m 'move files'
hg commit -m 'edit files'
hg fetch ../repo2 -d '2 0' -m 'automated merge'
|
Loading...