[MERGE REVIEW]

Olaf Conradi oohlaf at gmail.com
Mon Apr 10 06:57:12 BST 2006


On 10/04/06, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> Martin Pool wrote:
> | On 09/04/2006, at 4:36 PM, Aaron Bentley wrote:
> | Possibly this should be in blackbox/ since it's exercising the  command
> | line interface, not directly the merge code itself.
>
> Yes.  It's just that blackbox/test_merge.py doesn't exist in bzr.dev,
> and I already have a patch pending that would create it.  So I didn't
> want to create it twice.

My --remember patch also creates it.
https://lists.ubuntu.com/archives/bazaar-ng/2006q2/010655.html

Cheers
 -Olaf




More information about the bazaar mailing list