merging & hgignore

watlab watlab at twinmail.de
Thu Jun 30 08:34:21 CDT 2011


Quite simple use case:
Branch A contains file1 and a .hgignore file, which contains "file2".
Branch B contains file1 and file2 (and no .hgignore).

Now I want to merge changes in file1 from B into A. But of course, I don't
want to get file2 added to Branch A.
How can this be achieved?

--
View this message in context: http://mercurial.808500.n3.nabble.com/merging-hgignore-tp3125829p3125829.html
Sent from the General mailing list archive at Nabble.com.


More information about the Mercurial mailing list