Pull/push deltas on a per file basis?

[Poddey Alexander (CR/APA2)]

HI all,
I come from subversion (on linux), now need to work on Windows and decided to give mercurial a try.

I'm missing the following feature, which I think is included. Could someone please point me to the correct
documentation for this (I read the Book, the Tips and FAQ, probablely overlooked it there?):


my example:
think of 2 repositories (one cloned from the other) having 2 files:


rep1                            rep2
file1           file2           file1           file2

now suppose in rep2 I edit file2 to start developement of feature2 (r1,changeset1),
and file1 to include feature1 (r2,changeset2).
i finally complete feature2 (r3,changeset3)


in rep1 file2 gets edited to include feature2b (r1,changeset4).


now comes the merge:
assume feature2 in rep2 is mature, feature1 not.
now i want to have the changes corresponding to feature2 merged to rep1.

if i pull the changeset3, I automatically get the unmature feature1 (because all changesets up to 3 are pulled).

how can I pull the deltas on a per file and delta basis?
(in subversion terminology, i would merge the difference  (rep2,file2,r3)-(rep2,file2,r1) of file2 in rep1,file2.)



a windows specific? question:
If i have a file containing blank lines and add text in both repositories, but in different lines:

rep1                            rep2
file1:                          file1:
line1
                                line2


and pull/merge, the result looks like:
file1:
line1

line2

and not (as desired) like:
file1:
line1
line2



is this connected to line end encoding configuration? how to fix this?



thx
alex






-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090303/39c7521c/attachment.htm