view tests/test-merge-revert2.out @ 1076:01db658cc78a

tarball support v0.3

Hello,

I'm slowly improving support for tarballs in Mercurial. Attached patch
is made against current tip in Matt's repository - f859e9cba1b9, and
contains everything done so far.

Changes:
- gzip and bzip2 tarballs are sent immediately without writing to
temporary files (I was wrong Matt, it can be done very easy)
- hgrc customization, you can choose which type (if any) you will support

There's no easy way to support compression levels, since TarFile open()
assume that it is 9. I tried to use gzopen(), and bz2open() methods
instead, but it seems that headers of generated archives, are missing or
wrong. We could eventually try to rewrite tarfile.py and include our own
version into Mercurial, but I don't know if it's good idea...

Wojtek

1:f4d7a8c73d23
0:232e179b3f29
f4d7a8c73d23 tip
232e179b3f29
232e179b3f29+
232e179b3f29
f4d7a8c73d23 tip
merge: warning: conflicts during merge
merging file1
merging file1 failed!
diff -r f4d7a8c73d23 file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@
 added file1
 another line of text
+<<<<<<<
+changed file1 different
+=======
 changed file1
+>>>>>>>
M file1
f4d7a8c73d23+ tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip