[patch][bugfix] Merge deletes foo.new

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> To make it look nicer, you might like to use:
> output_file, new_file = mkstemp(dir=os.path.dirname(filename),
>                                 prefix=os.path.basename(filename))

Okay, I've updated the patch.

> Also, with changeset.py, is this a special directory created for each
> file? It looks like it, I just wanted to make sure that we wouldn't have
> filesystem conflicts if there is a merge in both foo/baz.py, and foo2/baz.py

Yes, a different temp directory is created for each text merge.

> 
> +1 from me, but with a suggestion.

Feel free to apply then, since I'm also +1.  My integration branch is
currently experiencing a pipeline stall due to making merge internals
private.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD0SFb0F+nu1YWqI0RApT5AJ9XU/3Kru1bFFI1oE/Aylc8WLft5wCePyZv
ih6LCXzIxLl+R2MtxvHeUxY=
=Sbax
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: filename-new2.patch
Type: text/x-patch
Size: 2928 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060120/c24657eb/attachment.bin