lp://staging/~denys.duchier/bzr-extmerge/bzr-extmerge-eacces

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~zindar/bzr-extmerge/trunk at revision 16

Erik Bågfors: Pending requested 2010-07-28

Diff: 26 lines (+3/-2)

1 file modified

extmerge.py (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

16. By Denys Duchier on 2010-07-28

harden run_extmerge for the case where subprocess.call raises EACCES

execvp (used by subprocess) returns EACCES (not ENOENT) when the
program name contains no slash and it cannot be found in the
search path.

15. By Erik Bågfors on 2009-11-25

Merge in Daniel Hahler's work for Beyond Compare

14. By Erik Bågfors on 2009-09-24

fixed some small documentation issues

13. By Erik Bågfors on 2009-09-23

merge in distutils branch

12. By Rob Connolly on 2009-01-27

Caught attribute error on lazy registration in older versions of bazaar.

11. By Aaron Bentley on 2008-10-22

Use lazy registration for extmerge command

10. By Erik Bågfors on 2008-03-11

merge in support for other external mergers, such as meld

9. By Erik Bågfors on 2008-03-11

pep8-ify

8. By Erik Bågfors on 2008-03-03

fix for small typo

7. By Ian Clatworthy on 2007-07-13

Make --all a local option instead of using the global one that no longer exists.