[patch][bugfix] Merge deletes foo.new

[John Arbash Meinel]

Aaron Bentley wrote:
> 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

Committed to revno=1507.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060120/1b1ea6ec/attachment.pgp