{var%20f='http://v.t.sina.com.cn/share/share.php?appkey=1515056452',u=z||d.location,p=['&url=',e(u),'&title=',e(t||d.title),'&source=',e(r),'&sourceUrl=',e(l),'&content=',c||'gb2312','&pic=',e(p||'')].join('');function%20a(){if(!window.open([f,p].join(''),'mb',['toolbar=0,status=0,resizable=1,width=440,height=430,left=',(s.width-440)/2,',top=',(s.height-430)/2].join('')))u.href=[f,p].join('');};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();})(screen,document,encodeURIComponent,'','','https://www.manongdao.com/data/attach/logo/logo.png', '推荐 Melony? 的问题《How does Mercurial handle splitted files?》','https://www.manongdao.com/q-1275116.html','页面编码gb2312|utf-8默认gb2312'));){kind=link}
How does mercurial handle splitted files? What will happen if I create a branch and split a file. Can I easily pull changes from another branch which modifies the original, unsplitted file?
相关问题
- Merge dataframes that have indices that one contai
- Merge Data from different Queries without duplicat
- Merging 1300 data frames into a single frame becom
- Correct procedure to use pending branch changes in
- Mercurial compared to private branches in SVN
相关文章
- Mercurial Commit Charts / Graphs [closed]
- What is the tortoisehg gui equivalent of doing “hg
- How to use Mercurial from Visual Studio 2010?
- Is there a version control system abstraction for
- Mercurial discard local changes of a file or group
- Mercurial .hgignore Negative Lookahead
- Interactively merge files tracked with git and unt
- SQL Server MERGE without a source table
After reading the clarification comment, the answer is no. Mercurial tracks files, not hunks of code, so it can't do that as far as I know.
I just did a little experiment. I created one repository (
foo) with one big file. Then I cloned that intobar, usedhg cpto copy the file into two files, and removed one half in both files. Then I made a change affecting the whole file infoo, and merged that intobar.As a result, the parts contained by the respective split file were merged correctly, while I got a conflict for the removed parts: my local version was empty, while the other version was the change from
foo.So if you're happy with removing these kinds of conflicts every time you merge, this might be good enough for you.