~bzr-pqm/bzr/bzr.dev

Committer: Vincent Ladeuil
Date: 2010-08-29 14:32:45 UTC
mfrom: <a title="Merged From 5345.5.13" href="/~bzr-pqm/bzr/bzr.dev/revision/5345.5.13?remember=4017">(5345.5.13 lockable-config-files)
mto: <a title="Merged In 5394.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/5394.1.1?remember=4017">(5394.1.1 integration)
mto: This revision was merged to the branch mainline in revision 5395 .
Revision ID: v.ladeuil+lp@free.fr-20100829143245-4kxyfllpt2xdfxg3

Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts

added added

removed removed

return self.run_bzr(args, **kwargs)[1]

conf = config.GlobalConfig.from_bytes('''[ALIASES]

conf = config.GlobalConfig.from_string('''[ALIASES]

c=cat

c1=cat -r 1

c2=cat -r 1 -r2