Created by Romain Chalumeau on 2010-07-16 and last modified on 2010-07-16
Get this branch:
bzr branch lp:~rom1-chal/bzr-builder/reporting_conflict_from_merge
Only Romain Chalumeau can upload to this branch. If you are Romain Chalumeau please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Romain Chalumeau

Recent revisions

99. By Romain Chalumeau on 2010-07-16

Tests updates
Take into account the new exceptions raised ConflictsDetected and ConflictsFromMerge
in tests :

98. By Romain Chalumeau on 2010-07-16

ConflictsDetected exception

97. By Romain Chalumeau on 2010-07-16

ConflictFromMerge exception

When a merge directive produces conflicts, a conflictFromMerge exception is raised.
The msg of the exception gives a complete report to ease the integrator solving the conflict ie :
- branch url which causes the conflict
- files in conflict
- authors who have committed the conflicted modifications
- path where to handle the conflicts

96. By James Westby on 2010-07-09

Work around debian.changelog adding newlines in old versions.

If you passed a file object it would add newlines in old versions. Avoid
that by just passing the string we are reading anyway.

95. By James Westby on 2010-07-09

Also reject other ways to escape the current working directory.

94. By James Westby on 2010-07-09

Reject absolute paths.

93. By James Westby on 2010-07-09

Reject duplicate paths in the recipe, as they aren't going to work.

92. By James Westby on 2010-07-09

Allow forbidding instructions at parse time.

91. By James Westby on 2010-07-09

Add {date} expansion for deb-version.

90. By James Westby on 2010-07-09

Tell the user what the available expansions are if they specify an invalid deb-version.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.