← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2005-09-05 05:35:25 UTC
  • mfrom: (974.1.55)
  • Revision ID: mbp@sourcefrog.net-20050905053525-2112bac069dbe331
- merge various bug fixes from aaron

aaron.bentley@utoronto.ca-20050905020131-a2d5b7711dd6cd98

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1180
1180
 
1181
1181
        if revision is None or len(revision) < 1:
1182
1182
            base = [None, None]
1183
 
            other = (branch, -1)
 
1183
            other = [branch, -1]
1184
1184
        else:
1185
1185
            if len(revision) == 1:
1186
 
                other = (branch, revision[0])
1187
 
                base = (None, None)
 
1186
                other = [branch, revision[0]]
 
1187
                base = [None, None]
1188
1188
            else:
1189
1189
                assert len(revision) == 2
1190
1190
                if None in revision:
1191
1191
                    raise BzrCommandError(
1192
1192
                        "Merge doesn't permit that revision specifier.")
1193
 
                base = (branch, revision[0])
1194
 
                other = (branch, revision[1])
 
1193
                base = [branch, revision[0]]
 
1194
                other = [branch, revision[1]]
1195
1195
 
1196
1196
        try:
1197
1197
            merge(other, base, check_clean=(not force), merge_type=merge_type)