~jeanfrancois.roy/bzr/url-safe-escape

Committer: Robert Collins
Date: 2005-09-19 06:05:19 UTC
mfrom: (974.1.92)
mto: (1185.50.1 jam-integration) (1092.3.4) (1417.1.4) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores) (1393.1.21)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: robertc@robertcollins.net-20050919060519-f582f62146b0b458

merge merge tweaks from aaron, which includes latest .dev

added added

removed removed

240

os.chmod(tree.full_path(id), mode)

241

242

def merge_changeset(self, merge_factory):

243

conflict_handler = changeset.ExceptionConflictHandler(self.this.dir)

243

conflict_handler = changeset.ExceptionConflictHandler()

244

return make_merge_changeset(self.cset, self.this, self.base,

245

self.other, conflict_handler,

246

merge_factory)