1
=== modified file 'NEWS'
2
--- NEWS	2010-02-04 11:02:01 +0000
3
+++ NEWS	2010-02-04 13:06:32 +0000
4
@@ -19,6 +19,7 @@
5
19
New Features
19
New Features
6
20
************
20
************
7
21
21
8
22
<<<<<<< TREE
9
22
* If the Apport crash-reporting tool is available, bzr crashes are now
23
* If the Apport crash-reporting tool is available, bzr crashes are now
10
23
  stored into the ``/var/crash`` apport spool directory, and the user is
24
  stored into the ``/var/crash`` apport spool directory, and the user is
11
24
  invited to report them to the developers from there, either
25
  invited to report them to the developers from there, either
12
@@ -31,6 +32,13 @@
13
31
* Stop sending apport crash files to ``.cache`` in the directory from
32
* Stop sending apport crash files to ``.cache`` in the directory from
14
32
  which ``bzr selftest`` was run.  (Martin Pool, #422350)
33
  which ``bzr selftest`` was run.  (Martin Pool, #422350)
15
33
34
16
35
=======
17
36
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
18
37
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
19
38
  as resolved is still accessible via the ``--done`` default action.
20
39
  (Vincent Ladeuil)
21
40
22
41
>>>>>>> MERGE-SOURCE
23
34
bzr 2.1.0 (not released yet)
42
bzr 2.1.0 (not released yet)
24
35
############################
43
############################
25
36
44
26
37
45
27
=== modified file 'bzrlib/conflicts.py'
28
--- bzrlib/conflicts.py	2010-01-08 07:37:25 +0000
29
+++ bzrlib/conflicts.py	2010-02-04 13:06:32 +0000
30
@@ -1,4 +1,4 @@
32
1
# Copyright (C) 2005, 2007 Canonical Ltd
1
# Copyright (C) 2005, 2007, 2009, 2010 Canonical Ltd
33
2
#
2
#
34
3
# This program is free software; you can redistribute it and/or modify
3
# This program is free software; you can redistribute it and/or modify
35
4
# it under the terms of the GNU General Public License as published by
4
# it under the terms of the GNU General Public License as published by
36
@@ -14,12 +14,11 @@
37
14
# along with this program; if not, write to the Free Software
14
# along with this program; if not, write to the Free Software
38
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
39
16
16
40
17
# TODO: Move this into builtins
41
18
42
19
# TODO: 'bzr resolve' should accept a directory name and work from that
17
# TODO: 'bzr resolve' should accept a directory name and work from that
43
20
# point down
18
# point down
44
21
19
45
22
import os
20
import os
46
21
import re
47
23
22
48
24
from bzrlib.lazy_import import lazy_import
23
from bzrlib.lazy_import import lazy_import
49
25
lazy_import(globals(), """
24
lazy_import(globals(), """
50
@@ -32,9 +31,14 @@
51
32
    osutils,
31
    osutils,
52
33
    rio,
32
    rio,
53
34
    trace,
33
    trace,
54
34
    transform,
55
35
    workingtree,
56
35
    )
36
    )
57
36
""")
37
""")
59
37
from bzrlib.option import Option
38
from bzrlib import (
60
39
    option,
61
40
    registry,
62
41
    )
63
38
42
64
39
43
65
40
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
44
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
66
@@ -55,14 +59,13 @@
67
55
    Use bzr resolve when you have fixed a problem.
59
    Use bzr resolve when you have fixed a problem.
68
56
    """
60
    """
69
57
    takes_options = [
61
    takes_options = [
72
58
            Option('text',
62
            option.Option('text',
73
59
                   help='List paths of files with text conflicts.'),
63
                          help='List paths of files with text conflicts.'),
74
60
        ]
64
        ]
75
61
    _see_also = ['resolve', 'conflict-types']
65
    _see_also = ['resolve', 'conflict-types']
76
62
66
77
63
    def run(self, text=False):
67
    def run(self, text=False):
80
64
        from bzrlib.workingtree import WorkingTree
68
        wt = workingtree.WorkingTree.open_containing(u'.')[0]
79
65
        wt = WorkingTree.open_containing(u'.')[0]
81
66
        for conflict in wt.conflicts():
69
        for conflict in wt.conflicts():
82
67
            if text:
70
            if text:
83
68
                if conflict.typestring != 'text conflict':
71
                if conflict.typestring != 'text conflict':
84
@@ -72,6 +75,28 @@
85
72
                self.outf.write(str(conflict) + '\n')
75
                self.outf.write(str(conflict) + '\n')
86
73
76
87
74
77
88
78
resolve_action_registry = registry.Registry()
89
79
90
80
91
81
resolve_action_registry.register(
92
82
    'done', 'done', 'Marks the conflict as resolved' )
93
83
resolve_action_registry.register(
94
84
    'take-this', 'take_this',
95
85
    'Resolve the conflict preserving the version in the working tree' )
96
86
resolve_action_registry.register(
97
87
    'take-other', 'take_other',
98
88
    'Resolve the conflict taking the merged version into account' )
99
89
resolve_action_registry.default_key = 'done'
100
90
101
91
class ResolveActionOption(option.RegistryOption):
102
92
103
93
    def __init__(self):
104
94
        super(ResolveActionOption, self).__init__(
105
95
            'action', 'How to resolve the conflict.',
106
96
            value_switches=True,
107
97
            registry=resolve_action_registry)
108
98
109
99
110
75
class cmd_resolve(commands.Command):
100
class cmd_resolve(commands.Command):
111
76
    """Mark a conflict as resolved.
101
    """Mark a conflict as resolved.
112
77
102
113
@@ -87,20 +112,33 @@
114
87
    aliases = ['resolved']
112
    aliases = ['resolved']
115
88
    takes_args = ['file*']
113
    takes_args = ['file*']
116
89
    takes_options = [
114
    takes_options = [
118
90
            Option('all', help='Resolve all conflicts in this tree.'),
115
            option.Option('all', help='Resolve all conflicts in this tree.'),
119
116
            ResolveActionOption(),
120
91
            ]
117
            ]
121
92
    _see_also = ['conflicts']
118
    _see_also = ['conflicts']
124
93
    def run(self, file_list=None, all=False):
119
    def run(self, file_list=None, all=False, action=None):
123
94
        from bzrlib.workingtree import WorkingTree
125
95
        if all:
120
        if all:
126
96
            if file_list:
121
            if file_list:
127
97
                raise errors.BzrCommandError("If --all is specified,"
122
                raise errors.BzrCommandError("If --all is specified,"
128
98
                                             " no FILE may be provided")
123
                                             " no FILE may be provided")
131
99
            tree = WorkingTree.open_containing('.')[0]
124
            tree = workingtree.WorkingTree.open_containing('.')[0]
132
100
            resolve(tree)
125
            if action is None:
133
126
                action = 'done'
134
101
        else:
127
        else:
135
102
            tree, file_list = builtins.tree_files(file_list)
128
            tree, file_list = builtins.tree_files(file_list)
136
103
            if file_list is None:
129
            if file_list is None:
137
130
                if action is None:
138
131
                    # FIXME: There is a special case here related to the option
139
132
                    # handling that could be clearer and easier to discover by
140
133
                    # providing an --auto action (bug #344013 and #383396) and
141
134
                    # make it mandatory instead of implicit and active only
142
135
                    # when no file_list is provided -- vila 091229
143
136
                    action = 'auto'
144
137
            else:
145
138
                if action is None:
146
139
                    action = 'done'
147
140
        if action == 'auto':
148
141
            if file_list is None:
149
104
                un_resolved, resolved = tree.auto_resolve()
142
                un_resolved, resolved = tree.auto_resolve()
150
105
                if len(un_resolved) > 0:
143
                if len(un_resolved) > 0:
151
106
                    trace.note('%d conflict(s) auto-resolved.', len(resolved))
144
                    trace.note('%d conflict(s) auto-resolved.', len(resolved))
152
@@ -112,10 +150,16 @@
153
112
                    trace.note('All conflicts resolved.')
150
                    trace.note('All conflicts resolved.')
154
113
                    return 0
151
                    return 0
155
114
            else:
152
            else:
160
115
                resolve(tree, file_list)
153
                # FIXME: This can never occur but the block above needs some
161
116
154
                # refactoring to transfer tree.auto_resolve() to
162
117
155
                # conflict.auto(tree) --vila 091242
163
118
def resolve(tree, paths=None, ignore_misses=False, recursive=False):
156
                pass
164
157
        else:
165
158
            resolve(tree, file_list, action=action)
166
159
167
160
168
161
def resolve(tree, paths=None, ignore_misses=False, recursive=False,
169
162
            action='done'):
170
119
    """Resolve some or all of the conflicts in a working tree.
163
    """Resolve some or all of the conflicts in a working tree.
171
120
164
172
121
    :param paths: If None, resolve all conflicts.  Otherwise, select only
165
    :param paths: If None, resolve all conflicts.  Otherwise, select only
173
@@ -125,24 +169,29 @@
174
125
        recursive commands like revert, this should be True.  For commands
169
        recursive commands like revert, this should be True.  For commands
175
126
        or applications wishing finer-grained control, like the resolve
170
        or applications wishing finer-grained control, like the resolve
176
127
        command, this should be False.
171
        command, this should be False.
179
128
    :ignore_misses: If False, warnings will be printed if the supplied paths
172
    :param ignore_misses: If False, warnings will be printed if the supplied
180
129
        do not have conflicts.
173
        paths do not have conflicts.
181
174
    :param action: How the conflict should be resolved,
182
130
    """
175
    """
183
131
    tree.lock_tree_write()
176
    tree.lock_tree_write()
184
132
    try:
177
    try:
185
133
        tree_conflicts = tree.conflicts()
178
        tree_conflicts = tree.conflicts()
186
134
        if paths is None:
179
        if paths is None:
187
135
            new_conflicts = ConflictList()
180
            new_conflicts = ConflictList()
189
136
            selected_conflicts = tree_conflicts
181
            to_process = tree_conflicts
190
137
        else:
182
        else:
194
138
            new_conflicts, selected_conflicts = \
183
            new_conflicts, to_process = tree_conflicts.select_conflicts(
195
139
                tree_conflicts.select_conflicts(tree, paths, ignore_misses,
184
                tree, paths, ignore_misses, recursive)
196
140
                    recursive)
185
        for conflict in to_process:
197
186
            try:
198
187
                conflict._do(action, tree)
199
188
                conflict.cleanup(tree)
200
189
            except NotImplementedError:
201
190
                new_conflicts.append(conflict)
202
141
        try:
191
        try:
203
142
            tree.set_conflicts(new_conflicts)
192
            tree.set_conflicts(new_conflicts)
204
143
        except errors.UnsupportedOperation:
193
        except errors.UnsupportedOperation:
205
144
            pass
194
            pass
206
145
        selected_conflicts.remove_files(tree)
207
146
    finally:
195
    finally:
208
147
        tree.unlock()
196
        tree.unlock()
209
148
197
210
@@ -237,12 +286,7 @@
211
237
        for conflict in self:
286
        for conflict in self:
212
238
            if not conflict.has_files:
287
            if not conflict.has_files:
213
239
                continue
288
                continue
220
240
            for suffix in CONFLICT_SUFFIXES:
289
            conflict.cleanup(tree)
215
241
                try:
216
242
                    osutils.delete_any(tree.abspath(conflict.path+suffix))
217
243
                except OSError, e:
218
244
                    if e.errno != errno.ENOENT:
219
245
                        raise
221
246
290
222
247
    def select_conflicts(self, tree, paths, ignore_misses=False,
291
    def select_conflicts(self, tree, paths, ignore_misses=False,
223
248
                         recurse=False):
292
                         recurse=False):
224
@@ -301,6 +345,7 @@
225
301
class Conflict(object):
345
class Conflict(object):
226
302
    """Base class for all types of conflict"""
346
    """Base class for all types of conflict"""
227
303
347
228
348
    # FIXME: cleanup should take care of that ? -- vila 091229
229
304
    has_files = False
349
    has_files = False
230
305
350
231
306
    def __init__(self, path, file_id=None):
351
    def __init__(self, path, file_id=None):
232
@@ -355,6 +400,32 @@
233
355
        else:
400
        else:
234
356
            return None, conflict.typestring
401
            return None, conflict.typestring
235
357
402
236
403
    def _do(self, action, tree):
237
404
        """Apply the specified action to the conflict.
238
405
239
406
        :param action: The method name to call.
240
407
241
408
        :param tree: The tree passed as a parameter to the method.
242
409
        """
243
410
        meth = getattr(self, action, None)
244
411
        if meth is None:
245
412
            raise NotImplementedError(self.__class__.__name__ + '.' + action)
246
413
        meth(tree)
247
414
248
415
    def cleanup(self, tree):
249
416
        raise NotImplementedError(self.cleanup)
250
417
251
418
    def done(self, tree):
252
419
        """Mark the conflict as solved once it has been handled."""
253
420
        # This method does nothing but simplifies the design of upper levels.
254
421
        pass
255
422
256
423
    def take_this(self, tree):
257
424
        raise NotImplementedError(self.take_this)
258
425
259
426
    def take_other(self, tree):
260
427
        raise NotImplementedError(self.take_other)
261
428
262
358
429
263
359
class PathConflict(Conflict):
430
class PathConflict(Conflict):
264
360
    """A conflict was encountered merging file paths"""
431
    """A conflict was encountered merging file paths"""
265
@@ -364,6 +435,7 @@
266
364
    format = 'Path conflict: %(path)s / %(conflict_path)s'
435
    format = 'Path conflict: %(path)s / %(conflict_path)s'
267
365
436
268
366
    rformat = '%(class)s(%(path)r, %(conflict_path)r, %(file_id)r)'
437
    rformat = '%(class)s(%(path)r, %(conflict_path)r, %(file_id)r)'
269
438
270
367
    def __init__(self, path, conflict_path=None, file_id=None):
439
    def __init__(self, path, conflict_path=None, file_id=None):
271
368
        Conflict.__init__(self, path, file_id)
440
        Conflict.__init__(self, path, file_id)
272
369
        self.conflict_path = conflict_path
441
        self.conflict_path = conflict_path
273
@@ -374,6 +446,17 @@
274
374
            s.add('conflict_path', self.conflict_path)
446
            s.add('conflict_path', self.conflict_path)
275
375
        return s
447
        return s
276
376
448
277
449
    def cleanup(self, tree):
278
450
        # No additional files have been generated here
279
451
        pass
280
452
281
453
    def take_this(self, tree):
282
454
        tree.rename_one(self.conflict_path, self.path)
283
455
284
456
    def take_other(self, tree):
285
457
        # just acccept bzr proposal
286
458
        pass
287
459
288
377
460
289
378
class ContentsConflict(PathConflict):
461
class ContentsConflict(PathConflict):
290
379
    """The files are of different types, or not present"""
462
    """The files are of different types, or not present"""
291
@@ -384,7 +467,30 @@
292
384
467
293
385
    format = 'Contents conflict in %(path)s'
468
    format = 'Contents conflict in %(path)s'
294
386
469
296
387
470
    def cleanup(self, tree):
297
471
        for suffix in ('.BASE', '.OTHER'):
298
472
            try:
299
473
                osutils.delete_any(tree.abspath(self.path + suffix))
300
474
            except OSError, e:
301
475
                if e.errno != errno.ENOENT:
302
476
                    raise
303
477
304
478
    # FIXME: I smell something weird here and it seems we should be able to be
305
479
    # more coherent with some other conflict ? bzr *did* a choice there but
306
480
    # neither take_this nor take_other reflect that... -- vila 091224
307
481
    def take_this(self, tree):
308
482
        tree.remove([self.path + '.OTHER'], force=True, keep_files=False)
309
483
310
484
    def take_other(self, tree):
311
485
        tree.remove([self.path], force=True, keep_files=False)
312
486
313
487
314
488
315
489
# FIXME: TextConflict is about a single file-id, there never is a conflict_path
316
490
# attribute so we shouldn't inherit from PathConflict but simply from Conflict
317
491
318
492
# TODO: There should be a base revid attribute to better inform the user about
319
493
# how the conflicts were generated.
320
388
class TextConflict(PathConflict):
494
class TextConflict(PathConflict):
321
389
    """The merge algorithm could not resolve all differences encountered."""
495
    """The merge algorithm could not resolve all differences encountered."""
322
390
496
323
@@ -394,6 +500,14 @@
324
394
500
325
395
    format = 'Text conflict in %(path)s'
501
    format = 'Text conflict in %(path)s'
326
396
502
327
503
    def cleanup(self, tree):
328
504
        for suffix in CONFLICT_SUFFIXES:
329
505
            try:
330
506
                osutils.delete_any(tree.abspath(self.path+suffix))
331
507
            except OSError, e:
332
508
                if e.errno != errno.ENOENT:
333
509
                    raise
334
510
335
397
511
336
398
class HandledConflict(Conflict):
512
class HandledConflict(Conflict):
337
399
    """A path problem that has been provisionally resolved.
513
    """A path problem that has been provisionally resolved.
338
@@ -414,6 +528,10 @@
339
414
        s.add('action', self.action)
528
        s.add('action', self.action)
340
415
        return s
529
        return s
341
416
530
342
531
    def cleanup(self, tree):
343
532
        """Nothing to cleanup."""
344
533
        pass
345
534
346
417
535
347
418
class HandledPathConflict(HandledConflict):
536
class HandledPathConflict(HandledConflict):
348
419
    """A provisionally-resolved path problem involving two paths.
537
    """A provisionally-resolved path problem involving two paths.
349
@@ -460,15 +578,22 @@
350
460
578
351
461
    format = 'Conflict adding file %(conflict_path)s.  %(action)s %(path)s.'
579
    format = 'Conflict adding file %(conflict_path)s.  %(action)s %(path)s.'
352
462
580
353
581
    def take_this(self, tree):
354
582
        tree.remove([self.conflict_path], force=True, keep_files=False)
355
583
        tree.rename_one(self.path, self.conflict_path)
356
584
357
585
    def take_other(self, tree):
358
586
        tree.remove([self.path], force=True, keep_files=False)
359
587
360
463
588
361
464
class ParentLoop(HandledPathConflict):
589
class ParentLoop(HandledPathConflict):
362
465
    """An attempt to create an infinitely-looping directory structure.
590
    """An attempt to create an infinitely-looping directory structure.
363
466
    This is rare, but can be produced like so:
591
    This is rare, but can be produced like so:
364
467
592
365
468
    tree A:
593
    tree A:
367
469
      mv foo/bar
594
      mv foo bar
368
470
    tree B:
595
    tree B:
370
471
      mv bar/foo
596
      mv bar foo
371
472
    merge A and B
597
    merge A and B
372
473
    """
598
    """
373
474
599
374
@@ -476,6 +601,27 @@
375
476
601
376
477
    format = 'Conflict moving %(conflict_path)s into %(path)s.  %(action)s.'
602
    format = 'Conflict moving %(conflict_path)s into %(path)s.  %(action)s.'
377
478
603
378
604
    def take_this(self, tree):
379
605
        # just acccept bzr proposal
380
606
        pass
381
607
382
608
    def take_other(self, tree):
383
609
        # FIXME: We shouldn't have to manipulate so many paths here (and there
384
610
        # is probably a bug or two...)
385
611
        base_path = osutils.basename(self.path)
386
612
        conflict_base_path = osutils.basename(self.conflict_path)
387
613
        tt = transform.TreeTransform(tree)
388
614
        try:
389
615
            p_tid = tt.trans_id_file_id(self.file_id)
390
616
            parent_tid = tt.get_tree_parent(p_tid)
391
617
            cp_tid = tt.trans_id_file_id(self.conflict_file_id)
392
618
            cparent_tid = tt.get_tree_parent(cp_tid)
393
619
            tt.adjust_path(base_path, cparent_tid, cp_tid)
394
620
            tt.adjust_path(conflict_base_path, parent_tid, p_tid)
395
621
            tt.apply()
396
622
        finally:
397
623
            tt.finalize()
398
624
399
479
625
400
480
class UnversionedParent(HandledConflict):
626
class UnversionedParent(HandledConflict):
401
481
    """An attempt to version a file whose parent directory is not versioned.
627
    """An attempt to version a file whose parent directory is not versioned.
402
@@ -488,18 +634,34 @@
403
488
    format = 'Conflict because %(path)s is not versioned, but has versioned'\
634
    format = 'Conflict because %(path)s is not versioned, but has versioned'\
404
489
             ' children.  %(action)s.'
635
             ' children.  %(action)s.'
405
490
636
406
637
    # FIXME: We silently do nothing to make tests pass, but most probably the
407
638
    # conflict shouldn't exist (the long story is that the conflict is
408
639
    # generated with another one that can be resolved properly) -- vila 091224
409
640
    def take_this(self, tree):
410
641
        pass
411
642
412
643
    def take_other(self, tree):
413
644
        pass
414
645
415
491
646
416
492
class MissingParent(HandledConflict):
647
class MissingParent(HandledConflict):
417
493
    """An attempt to add files to a directory that is not present.
648
    """An attempt to add files to a directory that is not present.
418
494
    Typically, the result of a merge where THIS deleted the directory and
649
    Typically, the result of a merge where THIS deleted the directory and
419
495
    the OTHER added a file to it.
650
    the OTHER added a file to it.
421
496
    See also: DeletingParent (same situation, reversed THIS and OTHER)
651
    See also: DeletingParent (same situation, THIS and OTHER reversed)
422
497
    """
652
    """
423
498
653
424
499
    typestring = 'missing parent'
654
    typestring = 'missing parent'
425
500
655
426
501
    format = 'Conflict adding files to %(path)s.  %(action)s.'
656
    format = 'Conflict adding files to %(path)s.  %(action)s.'
427
502
657
428
658
    def take_this(self, tree):
429
659
        tree.remove([self.path], force=True, keep_files=False)
430
660
431
661
    def take_other(self, tree):
432
662
        # just acccept bzr proposal
433
663
        pass
434
664
435
503
665
436
504
class DeletingParent(HandledConflict):
666
class DeletingParent(HandledConflict):
437
505
    """An attempt to add files to a directory that is not present.
667
    """An attempt to add files to a directory that is not present.
438
@@ -512,9 +674,19 @@
439
512
    format = "Conflict: can't delete %(path)s because it is not empty.  "\
674
    format = "Conflict: can't delete %(path)s because it is not empty.  "\
440
513
             "%(action)s."
675
             "%(action)s."
441
514
676
442
677
    # FIXME: It's a bit strange that the default action is not coherent with
443
678
    # MissingParent from the *user* pov.
444
679
445
680
    def take_this(self, tree):
446
681
        # just acccept bzr proposal
447
682
        pass
448
683
449
684
    def take_other(self, tree):
450
685
        tree.remove([self.path], force=True, keep_files=False)
451
686
452
515
687
453
516
class NonDirectoryParent(HandledConflict):
688
class NonDirectoryParent(HandledConflict):
455
517
    """An attempt to add files to a directory that is not a director or
689
    """An attempt to add files to a directory that is not a directory or
456
518
    an attempt to change the kind of a directory with files.
690
    an attempt to change the kind of a directory with files.
457
519
    """
691
    """
458
520
692
459
@@ -523,6 +695,27 @@
460
523
    format = "Conflict: %(path)s is not a directory, but has files in it."\
695
    format = "Conflict: %(path)s is not a directory, but has files in it."\
461
524
             "  %(action)s."
696
             "  %(action)s."
462
525
697
463
698
    # FIXME: .OTHER should be used instead of .new when the conflict is created
464
699
465
700
    def take_this(self, tree):
466
701
        # FIXME: we should preserve that path when the conflict is generated !
467
702
        if self.path.endswith('.new'):
468
703
            conflict_path = self.path[:-(len('.new'))]
469
704
            tree.remove([self.path], force=True, keep_files=False)
470
705
            tree.add(conflict_path)
471
706
        else:
472
707
            raise NotImplementedError(self.take_this)
473
708
474
709
    def take_other(self, tree):
475
710
        # FIXME: we should preserve that path when the conflict is generated !
476
711
        if self.path.endswith('.new'):
477
712
            conflict_path = self.path[:-(len('.new'))]
478
713
            tree.remove([conflict_path], force=True, keep_files=False)
479
714
            tree.rename_one(self.path, conflict_path)
480
715
        else:
481
716
            raise NotImplementedError(self.take_other)
482
717
483
718
484
526
ctype = {}
719
ctype = {}
485
527
720
486
528
721
487
@@ -532,7 +725,6 @@
488
532
    for conflict_type in conflict_types:
725
    for conflict_type in conflict_types:
489
533
        ctype[conflict_type.typestring] = conflict_type
726
        ctype[conflict_type.typestring] = conflict_type
490
534
727
491
535
492
536
register_types(ContentsConflict, TextConflict, PathConflict, DuplicateID,
728
register_types(ContentsConflict, TextConflict, PathConflict, DuplicateID,
493
537
               DuplicateEntry, ParentLoop, UnversionedParent, MissingParent,
729
               DuplicateEntry, ParentLoop, UnversionedParent, MissingParent,
494
538
               DeletingParent, NonDirectoryParent)
730
               DeletingParent, NonDirectoryParent)
495
539
731
496
=== modified file 'bzrlib/help_topics/en/conflict-types.txt'
497
--- bzrlib/help_topics/en/conflict-types.txt	2010-01-08 07:37:25 +0000
498
+++ bzrlib/help_topics/en/conflict-types.txt	2010-02-04 13:06:32 +0000
499
@@ -3,16 +3,59 @@
500
3
3
501
4
Some operations, like merge, revert and pull, modify the contents of your
4
Some operations, like merge, revert and pull, modify the contents of your
502
5
working tree.  These modifications are programmatically generated, and so they
5
working tree.  These modifications are programmatically generated, and so they
509
6
may conflict with the current state of your working tree. Many kinds of changes
6
may conflict with the current state of your working tree. 
510
7
can be combined programmatically, but sometimes only a human can determine the
7
511
8
right thing to do.  When this happens Bazaar will inform you that there is a
8
When conflicts are present in your working tree (as shown by ``bzr
512
9
conflict and then ask you to resolve it.  The command to tell Bazaar a conflict
9
conflicts``), you should resolve them and then inform bzr that the conflicts
513
10
is resolved is ``resolve``, but you must perform some action before you can do
10
have been resolved.
514
11
this.
11
515
12
Resolving conflicts is sometimes not obvious. Either because the user that
516
13
should resolve them is not the one responsible for their occurrence, as is the
517
14
case when merging other people's work or because some conflicts are presented
518
15
in a way that is not easy to understand.
519
16
520
17
Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the
521
18
conflict if and only if there's an actual conceptual conflict in the source
522
19
tree.  Because Bazaar doesn't understand the real meaning of the files being
523
20
versioned, it can, when faced with ambiguities, fall short in either direction
524
21
trying to resolve the conflict itself. Many kinds of changes can be combined
525
22
programmatically, but sometimes only a human can determine the right thing to
526
23
do.
527
24
528
25
When Bazaar generates a conflict, it adds information into the working tree to
529
26
present the conflicting versions, and it's up to you to find the correct
530
27
resolution.
531
28
532
29
Whatever the conflict is, resolving it is roughly done in two steps::
533
30
534
31
 * modify the working tree content so that the conflicted item is now in the
535
32
   state you want to keep,
536
33
537
34
 * inform Bazaar that the conflict is now solved and ask to cleanup any
538
35
   remaining generated information (``bzr resolve <item>``).
539
36
540
37
For most conflict types, there are some obvious ways to modify the working
541
38
tree and put it into the desired state. For some types of conflicts, Bazaar
542
39
itself already made a choice, when possible.
543
40
544
41
Yet, whether Bazaar makes a choice or not, there are some other simple but
545
42
different ways to resolve the conflict.
546
12
43
547
13
Each type of conflict is explained below, and the action which must be done to
44
Each type of conflict is explained below, and the action which must be done to
548
14
resolve the conflict is outlined.
45
resolve the conflict is outlined.
549
15
46
550
47
Various actions are available depending on the kind of conflict, for some of
551
48
these actions, Bazaar can provide some help. In the end you should at least
552
49
inform Bazaar that you're done with the conflict with::
553
50
554
51
  ``bzr resolve FILE --action=done'
555
52
556
53
Note that this is the default action when a single file is involved so you can
557
54
simply use::
558
55
559
56
   ``bzr resolve FILE``
560
57
561
58
See ``bzr help resolve`` for more details.
562
16
59
563
17
Text conflicts
60
Text conflicts
564
18
--------------
61
--------------
565
@@ -54,8 +97,12 @@
566
54
you are done editing, the file should look like it never had a conflict, and be
97
you are done editing, the file should look like it never had a conflict, and be
567
55
ready to commit.
98
ready to commit.
568
56
99
571
57
When you have resolved text conflicts, just run "bzr resolve", and Bazaar will
100
When you have resolved text conflicts, just run ``bzr resolve --auto``, and
572
58
auto-detect which conflicts you have resolved.
101
Bazaar will auto-detect which conflicts you have resolved.
573
102
574
103
When the conflict is resolved, Bazaar deletes the previously generated
575
104
``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the
576
105
working tree.
577
59
106
578
60
Content conflicts
107
Content conflicts
579
61
-----------------
108
-----------------
580
@@ -64,20 +111,29 @@
581
64
111
582
65
  Contents conflict in FILE
112
  Contents conflict in FILE
583
66
113
588
67
This conflict happens when there are conflicting changes in the target tree and
114
This conflict happens when there are conflicting changes in the working tree
589
68
the merge source, but the conflicted items are not text files.  They may be
115
and the merge source, but the conflicted items are not text files.  They may
590
69
binary files, or symlinks, or directories.  It can even happen with files that
116
be binary files, or symlinks, or directories.  It can even happen with files
591
70
are deleted on one side, and modified on the other.
117
that are deleted on one side, and modified on the other.
592
71
118
593
72
Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may be
119
Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may be
594
73
regular files, symlinks or directories).  But it will not include a "main copy"
120
regular files, symlinks or directories).  But it will not include a "main copy"
595
74
of the file with herringbone conflict markers.  It will appear that the "main
121
of the file with herringbone conflict markers.  It will appear that the "main
596
75
copy" has been renamed to THIS or OTHER.
122
copy" has been renamed to THIS or OTHER.
597
76
123
602
77
To resolve this, use "bzr mv" to rename the file back to its normal name, and
124
To resolve that kind of conflict, you should rebuild FILE from either version
603
78
combine the changes manually.  When you are satisfied, run "bzr resolve
125
or a combination of both.
604
79
FILE".  Bazaar cannot auto-detect when conflicts of this kind have been
126
605
80
resolved.
127
``bzr resolve`` recognizes the following actions:
606
128
607
129
 * ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
608
130
 * ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
609
131
 * ``--action=done`` will just mark the conflict as resolved.
610
132
611
133
Any action will also delete the previously generated ``.BASE``, ``.THIS`` and
612
134
``.OTHER`` files if they are still present in the working tree.
613
135
614
136
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
615
81
137
616
82
Tag conflicts
138
Tag conflicts
617
83
-------------
139
-------------
618
@@ -95,12 +151,13 @@
619
95
To resolve the conflict, you must apply the correct tags to either the target
151
To resolve the conflict, you must apply the correct tags to either the target
620
96
branch or the source branch as appropriate.  Use "bzr tags --show-ids -d
152
branch or the source branch as appropriate.  Use "bzr tags --show-ids -d
621
97
SOURCE_URL" to see the tags in the source branch.  If you want to make the
153
SOURCE_URL" to see the tags in the source branch.  If you want to make the
623
98
target branch's tags match the source branch, then in the target branch do 
154
target branch's tags match the source branch, then in the target branch do
624
99
``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the
155
``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the
625
100
CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the source
156
CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the source
629
101
branch.  You need not call "bzr resolve" after doing this.  To resolve in favor of the target branch, you need to similarly use ``tag --force`` in the source
157
branch.  You need not call "bzr resolve" after doing this.  To resolve in
630
102
branch.  (Note that pulling or pushing using --overwrite will overwrite all
158
favor of the target branch, you need to similarly use ``tag --force`` in the
631
103
tags as well.)
159
source branch.  (Note that pulling or pushing using --overwrite will overwrite
632
160
all tags as well.)
633
104
161
634
105
Duplicate paths
162
Duplicate paths
635
106
---------------
163
---------------
636
@@ -110,10 +167,20 @@
637
110
  Conflict adding file FILE.  Moved existing file to FILE.moved.
167
  Conflict adding file FILE.  Moved existing file to FILE.moved.
638
111
168
639
112
Sometimes Bazaar will attempt to create a file using a pathname that has
169
Sometimes Bazaar will attempt to create a file using a pathname that has
644
113
already been used.  The existing file will be renamed to "FILE.moved".  If
170
already been used.  The existing file will be renamed to "FILE.moved".  
645
114
you wish, you can rename either one of these files, or combine their contents.
171
646
115
When you are satisfied, you can run "bzr resolve FILE" to mark the conflict as
172
To resolve that kind of conflict, you should rebuild FILE from either version
647
116
resolved.
173
or a combination of both.
648
174
649
175
``bzr resolve`` recognizes the following actions::
650
176
651
177
 * ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved FILE``,
652
178
 *  ``--action=take-other`` will issue ``bzr rm FILE.moved``,
653
179
 * ``--action=done`` will just mark the conflict as resolved.
654
180
655
181
Note that you must get rid of FILE.moved before using ``--action=done``.
656
182
657
183
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
658
117
184
659
118
Unversioned parent
185
Unversioned parent
660
119
------------------
186
------------------
661
@@ -137,26 +204,47 @@
662
137
204
663
138
  Conflict adding files to FILE.  Created directory.
205
  Conflict adding files to FILE.  Created directory.
664
139
206
672
140
This happens when a file has been deleted in the target, but has new children
207
This happens when a directory has been deleted in the target, but has new
673
141
in the source.  This is similar to the "unversioned parent" conflict, except
208
children in the source.  This is similar to the "unversioned parent" conflict,
674
142
that the parent directory does not *exist*, instead of just being unversioned.
209
except that the parent directory does not *exist*, instead of just being
675
143
In this situation, Bazaar will create the missing parent.  Resolving this issue
210
unversioned.  In this situation, Bazaar will create the missing parent.
676
144
depends very much on the particular scenario.  You may wish to rename or delete
211
Resolving this issue depends very much on the particular scenario.
677
145
either the file or the directory.  When you are satisfied, you can run "bzr
212
678
146
resolve FILE" to mark the conflict as resolved.
213
To resolve that kind of conflict, you should either remove or rename the
679
214
children or the directory or a combination of both.
680
215
681
216
``bzr resolve`` recognizes the following actions::
682
217
683
218
 * ``--action=take-this`` will issue ``bzr rm directory``
684
219
   including the children,
685
220
 * ``--action=take-other`` will acknowledge Bazaar choice to keep
686
221
   the children and restoring the directory,
687
222
 * ``--action=done`` will just mark the conflict as resolved.
688
223
689
224
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
690
147
225
691
148
Deleting parent
226
Deleting parent
692
149
---------------
227
---------------
693
150
228
694
151
Typical message::
229
Typical message::
695
152
230
697
153
  Conflict: can't delete FILE because it is not empty.  Not deleting.
231
  Conflict: can't delete DIR because it is not empty.  Not deleting.
698
154
232
699
155
This is the opposite of "missing parent".  A directory is deleted in the
233
This is the opposite of "missing parent".  A directory is deleted in the
700
156
source, but has new children in the target.  Bazaar will retain the directory.
234
source, but has new children in the target.  Bazaar will retain the directory.
704
157
Resolving this issue depends very much on the particular scenario.  You may
235
Resolving this issue depends very much on the particular scenario.
705
158
wish to rename or delete either the file or the directory.  When you are
236
706
159
satisfied, you can run "bzr resolve FILE" to mark the conflict as resolved.
237
To resolve that kind of conflict, you should either remove or rename the
707
238
children or the directory or a combination of both.
708
239
709
240
``bzr resolve`` recognizes the following actions::
710
241
711
242
 * ``--action=take-this`` will acknowledge Bazaar choice to keep the directory,
712
243
 * ``--action=take-other`` will issue ``bzr rm directory`` including the 
713
244
   children,
714
245
 * ``--action=done`` will just mark the conflict as resolved.
715
246
716
247
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
717
160
248
718
161
Path conflict
249
Path conflict
719
162
-------------
250
-------------
720
@@ -166,9 +254,19 @@
721
166
  Path conflict: PATH1 / PATH2
254
  Path conflict: PATH1 / PATH2
722
167
255
723
168
This happens when the source and target have each modified the name or parent
256
This happens when the source and target have each modified the name or parent
727
169
directory of a file.  Bazaar will use the path elements from the source.  You
257
directory of a file.  Bazaar will use the path elements from the source.
728
170
can rename the file, and once you have, run "bzr resolve FILE" to mark the
258
729
171
conflict as resolved.
259
To resolve that kind of conflict, you just have to decide what name should be
730
260
retained for the file involved.
731
261
732
262
``bzr resolve`` recognizes the following actions::
733
263
734
264
 * ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by
735
265
   issuing ``bzr mv PATH2 PATH1``,
736
266
 * ``--action=take-other`` will acknowledge Bazaar choice of keeping ``PATH2``,
737
267
 * ``--action=done`` will just mark the conflict as resolved.
738
268
739
269
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
740
172
270
741
173
Parent loop
271
Parent loop
742
174
-----------
272
-----------
743
@@ -179,45 +277,67 @@
744
179
277
745
180
This happens when the source and the target have each moved directories, so
278
This happens when the source and the target have each moved directories, so
746
181
that, if the change could be applied, a directory would be contained by itself.
279
that, if the change could be applied, a directory would be contained by itself.
748
182
For example::
280
For example:
749
183
281
750
184
  $ bzr init
282
  $ bzr init
753
185
  $ bzr mkdir a
283
  $ bzr mkdir white
754
186
  $ bzr mkdir b
284
  $ bzr mkdir black
755
187
  $ bzr commit -m "BASE"
285
  $ bzr commit -m "BASE"
756
188
  $ bzr branch . ../other
286
  $ bzr branch . ../other
758
189
  $ bzr mv a b
287
  $ bzr mv white black
759
190
  $ bzr commit -m "THIS"
288
  $ bzr commit -m "THIS"
761
191
  $ bzr mv ../other/b ../other/a
289
  $ bzr mv ../other/black ../other/white
762
192
  $ bzr commit ../other -m "OTHER"
290
  $ bzr commit ../other -m "OTHER"
763
193
  $ bzr merge ../other
291
  $ bzr merge ../other
764
194
292
768
195
In this situation, Bazaar will cancel the move, and leave "a" in "b".
293
In this situation, Bazaar will cancel the move, and leave ``white`` in
769
196
You can rename the directories if you like, and once you have, run "bzr resolve
294
``black``.  To resolve that kind of conflict, you just have to decide what
770
197
FILE" to mark the conflict as resolved.
295
name should be retained for the directories involved.
771
296
772
297
``bzr resolve`` recognizes the following actions::
773
298
774
299
 * ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` 
775
300
   in ``black``,
776
301
 * ``--action=take-other`` will revert Bazaar choice and move ``black`` in
777
302
   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,
778
303
 * ``--action=done`` will just mark the conflict as resolved.
779
304
780
305
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
781
198
306
782
199
Non-directory parent
307
Non-directory parent
783
200
--------------------
308
--------------------
784
201
309
785
202
Typical message::
310
Typical message::
786
203
311
788
204
  Conflict: FILE.new is not a directory, but has files in it.
312
  Conflict: foo.new is not a directory, but has files in it.
789
205
  Created directory.
313
  Created directory.
790
206
314
791
207
This happens when one side has added files to a directory, and the other side
315
This happens when one side has added files to a directory, and the other side
793
208
has changed the directory into a file or symlink.  For example::
316
has changed the directory into a file or symlink.  For example:
794
209
317
795
210
  $ bzr init
318
  $ bzr init
797
211
  $ bzr mkdir a
319
  $ bzr mkdir foo
798
212
  $ bzr commit -m "BASE"
320
  $ bzr commit -m "BASE"
799
213
  $ bzr branch . ../other
321
  $ bzr branch . ../other
802
214
  $ rmdir a
322
  $ rmdir foo
803
215
  $ touch a
323
  $ touch foo
804
216
  $ bzr commit -m "THIS"
324
  $ bzr commit -m "THIS"
806
217
  $ bzr mkdir ../other/a/b
325
  $ bzr mkdir ../other/foo/bar
807
218
  $ bzr commit ../other -m "OTHER"
326
  $ bzr commit ../other -m "OTHER"
808
219
  $ bzr merge ../other
327
  $ bzr merge ../other
809
220
328
810
329
To resolve that kind of conflict, you have to decide what name should be
811
330
retained for the file, directory or symlink involved.
812
331
813
332
``bzr resolve`` recognizes the following actions::
814
333
815
334
 * ``--action=take-this`` will issue ``bzr rm --force foo.new`` and 
816
335
   ``bzr add foo``,
817
336
 * ``--action=take-other`` will issue ``bzr rm --force foo`` and 
818
337
   ``bzr mv foo.new foo``,
819
338
 * ``--action=done`` will just mark the conflict as resolved.
820
339
821
340
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
822
221
341
823
222
MalformedTransform
342
MalformedTransform
824
223
------------------
343
------------------
825
224
344
826
=== added directory 'bzrlib/help_topics/es'
827
=== removed directory 'bzrlib/help_topics/es'
828
=== renamed file 'bzrlib/help_topics/es/conflicts.txt' => 'bzrlib/help_topics/es/conflict-types.txt'
829
=== modified file 'bzrlib/option.py'
830
--- bzrlib/option.py	2009-08-18 08:10:44 +0000
831
+++ bzrlib/option.py	2010-02-04 13:06:31 +0000
832
@@ -361,7 +361,7 @@
833
361
361
834
362
        name, help, value_switches and enum_switch are passed to the
362
        name, help, value_switches and enum_switch are passed to the
835
363
        RegistryOption constructor.  Any other keyword arguments are treated
363
        RegistryOption constructor.  Any other keyword arguments are treated
837
364
        as values for the option, and they value is treated as the help.
364
        as values for the option, and their value is treated as the help.
838
365
        """
365
        """
839
366
        reg = _mod_registry.Registry()
366
        reg = _mod_registry.Registry()
840
367
        for name, switch_help in kwargs.iteritems():
367
        for name, switch_help in kwargs.iteritems():
841
368
368
842
=== modified file 'bzrlib/tests/blackbox/test_conflicts.py'
843
--- bzrlib/tests/blackbox/test_conflicts.py	2009-03-23 14:59:43 +0000
844
+++ bzrlib/tests/blackbox/test_conflicts.py	2010-02-04 13:06:32 +0000
845
@@ -1,4 +1,4 @@
847
1
# Copyright (C) 2006 Canonical Ltd
1
# Copyright (C) 2006, 2009, 2010 Canonical Ltd
848
2
#
2
#
849
3
# This program is free software; you can redistribute it and/or modify
3
# This program is free software; you can redistribute it and/or modify
850
4
# it under the terms of the GNU General Public License as published by
4
# it under the terms of the GNU General Public License as published by
851
@@ -14,21 +14,22 @@
852
14
# along with this program; if not, write to the Free Software
14
# along with this program; if not, write to the Free Software
853
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
854
16
16
855
17
import os
856
18
857
19
from bzrlib import (
17
from bzrlib import (
859
20
    conflicts
18
    conflicts,
860
19
    tests,
861
20
    workingtree,
862
21
    )
21
    )
863
22
from bzrlib.workingtree import WorkingTree
864
23
from bzrlib.tests.blackbox import ExternalBase
865
24
22
866
25
# FIXME: These don't really look at the output of the conflict commands, just
23
# FIXME: These don't really look at the output of the conflict commands, just
867
26
# the number of lines - there should be more examination.
24
# the number of lines - there should be more examination.
868
27
25
870
28
class TestConflicts(ExternalBase):
26
class TestConflictsBase(tests.TestCaseWithTransport):
871
29
27
872
30
    def setUp(self):
28
    def setUp(self):
874
31
        super(ExternalBase, self).setUp()
29
        super(TestConflictsBase, self).setUp()
875
30
        self.make_tree_with_conflicts()
876
31
877
32
    def make_tree_with_conflicts(self):
878
32
        a_tree = self.make_branch_and_tree('a')
33
        a_tree = self.make_branch_and_tree('a')
879
33
        self.build_tree_contents([
34
        self.build_tree_contents([
880
34
            ('a/myfile', 'contentsa\n'),
35
            ('a/myfile', 'contentsa\n'),
881
@@ -53,45 +54,48 @@
882
53
        a_tree.rename_one('mydir', 'mydir3')
54
        a_tree.rename_one('mydir', 'mydir3')
883
54
        a_tree.commit(message='change')
55
        a_tree.commit(message='change')
884
55
        a_tree.merge_from_branch(b_tree.branch)
56
        a_tree.merge_from_branch(b_tree.branch)
886
56
        os.chdir('a')
57
887
58
    def run_bzr(self, cmd, working_dir='a', **kwargs):
888
59
        return super(TestConflictsBase, self).run_bzr(
889
60
            cmd, working_dir=working_dir, **kwargs)
890
61
891
62
892
63
class TestConflicts(TestConflictsBase):
893
57
64
894
58
    def test_conflicts(self):
65
    def test_conflicts(self):
897
59
        conflicts, errs = self.run_bzr('conflicts')
66
        out, err = self.run_bzr('conflicts')
898
60
        self.assertEqual(3, len(conflicts.splitlines()))
67
        self.assertEqual(3, len(out.splitlines()))
899
61
68
900
62
    def test_conflicts_text(self):
69
    def test_conflicts_text(self):
903
63
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
70
        out, err = self.run_bzr('conflicts --text')
904
64
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
71
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
905
72
906
73
907
74
class TestResolve(TestConflictsBase):
908
65
75
909
66
    def test_resolve(self):
76
    def test_resolve(self):
910
67
        self.run_bzr('resolve myfile')
77
        self.run_bzr('resolve myfile')
913
68
        conflicts, errs = self.run_bzr('conflicts')
78
        out, err = self.run_bzr('conflicts')
914
69
        self.assertEqual(2, len(conflicts.splitlines()))
79
        self.assertEqual(2, len(out.splitlines()))
915
70
        self.run_bzr('resolve my_other_file')
80
        self.run_bzr('resolve my_other_file')
916
71
        self.run_bzr('resolve mydir2')
81
        self.run_bzr('resolve mydir2')
919
72
        conflicts, errs = self.run_bzr('conflicts')
82
        out, err = self.run_bzr('conflicts')
920
73
        self.assertEqual(len(conflicts.splitlines()), 0)
83
        self.assertEqual(0, len(out.splitlines()))
921
74
84
922
75
    def test_resolve_all(self):
85
    def test_resolve_all(self):
923
76
        self.run_bzr('resolve --all')
86
        self.run_bzr('resolve --all')
926
77
        conflicts, errs = self.run_bzr('conflicts')
87
        out, err = self.run_bzr('conflicts')
927
78
        self.assertEqual(len(conflicts.splitlines()), 0)
88
        self.assertEqual(0, len(out.splitlines()))
928
79
89
929
80
    def test_resolve_in_subdir(self):
90
    def test_resolve_in_subdir(self):
930
81
        """resolve when run from subdirectory should handle relative paths"""
91
        """resolve when run from subdirectory should handle relative paths"""
944
82
        orig_dir = os.getcwdu()
92
        self.build_tree(["a/subdir/"])
945
83
        try:
93
        self.run_bzr("resolve ../myfile", working_dir='a/subdir')
946
84
            os.mkdir("subdir")
94
        self.run_bzr("resolve ../a/myfile", working_dir='b')
947
85
            os.chdir("subdir")
95
        wt = workingtree.WorkingTree.open_containing('b')[0]
948
86
            self.run_bzr("resolve ../myfile")
96
        conflicts = wt.conflicts()
949
87
            os.chdir("../../b")
97
        self.assertEqual(True, conflicts.is_empty(),
950
88
            self.run_bzr("resolve ../a/myfile")
98
                         "tree still contains conflicts: %r" % conflicts)
938
89
            wt = WorkingTree.open_containing('.')[0]
939
90
            conflicts = wt.conflicts()
940
91
            if not conflicts.is_empty():
941
92
                self.fail("tree still contains conflicts: %r" % conflicts)
942
93
        finally:
943
94
            os.chdir(orig_dir)
951
95
99
952
96
    def test_auto_resolve(self):
100
    def test_auto_resolve(self):
953
97
        """Text conflicts can be resolved automatically"""
101
        """Text conflicts can be resolved automatically"""
954
@@ -102,11 +106,10 @@
955
102
        self.assertEqual(tree.kind('file_id'), 'file')
106
        self.assertEqual(tree.kind('file_id'), 'file')
956
103
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
107
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
957
104
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
108
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
960
105
        os.chdir('tree')
109
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
959
106
        note = self.run_bzr('resolve', retcode=1)[1]
961
107
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
110
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
962
108
        self.assertContainsRe(note,
111
        self.assertContainsRe(note,
963
109
            'Remaining conflicts:\nText conflict in file')
112
            'Remaining conflicts:\nText conflict in file')
966
110
        self.build_tree_contents([('file', 'a\n')])
113
        self.build_tree_contents([('tree/file', 'a\n')])
967
111
        note = self.run_bzr('resolve')[1]
114
        note = self.run_bzr('resolve', working_dir='tree')[1]
968
112
        self.assertContainsRe(note, 'All conflicts resolved.')
115
        self.assertContainsRe(note, 'All conflicts resolved.')
969
113
116
970
=== modified file 'bzrlib/tests/test_conflicts.py'
971
--- bzrlib/tests/test_conflicts.py	2010-01-04 14:56:59 +0000
972
+++ bzrlib/tests/test_conflicts.py	2010-02-04 13:06:32 +0000
973
@@ -21,8 +21,10 @@
974
21
    bzrdir,
21
    bzrdir,
975
22
    conflicts,
22
    conflicts,
976
23
    errors,
23
    errors,
977
24
    option,
978
24
    tests,
25
    tests,
979
25
    )
26
    )
980
27
from bzrlib.tests import script
981
26
28
982
27
29
983
28
# TODO: Test commit with some added, and added-but-missing files
30
# TODO: Test commit with some added, and added-but-missing files
984
@@ -171,3 +173,504 @@
985
171
            if 'conflict_file_id' in stanza:
173
            if 'conflict_file_id' in stanza:
986
172
                self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
174
                self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
987
173
175
988
176
989
177
# FIXME: Tests missing for DuplicateID conflict type
990
178
class TestResolveConflicts(script.TestCaseWithTransportAndScript):
991
179
992
180
    preamble = None # The setup script set by daughter classes
993
181
994
182
    def setUp(self):
995
183
        super(TestResolveConflicts, self).setUp()
996
184
        self.run_script(self.preamble)
997
185
998
186
999
187
class TestResolveTextConflicts(TestResolveConflicts):
1000
188
    # TBC
1001
189
    pass
1002
190
1003
191
1004
192
class TestResolveContentConflicts(TestResolveConflicts):
1005
193
1006
194
    # FIXME: We need to add the reverse case (delete in trunk, modify in
1007
195
    # branch) but that could wait until the resolution mechanism is implemented.
1008
196
1009
197
    preamble = """
1010
198
$ bzr init trunk
1011
199
$ cd trunk
1012
200
$ echo 'trunk content' >file
1013
201
$ bzr add file
1014
202
$ bzr commit -m 'Create trunk'
1015
203
1016
204
$ bzr branch . ../branch
1017
205
$ cd ../branch
1018
206
$ bzr rm file
1019
207
$ bzr commit -m 'Delete file'
1020
208
1021
209
$ cd ../trunk
1022
210
$ echo 'more content' >>file
1023
211
$ bzr commit -m 'Modify file'
1024
212
1025
213
$ cd ../branch
1026
214
$ bzr merge ../trunk
1027
215
2>+N  file.OTHER
1028
216
2>Contents conflict in file
1029
217
2>1 conflicts encountered.
1030
218
"""
1031
219
1032
220
    def test_take_this(self):
1033
221
        self.run_script("""
1034
222
$ bzr rm file.OTHER --force # a simple rm file.OTHER is valid too
1035
223
$ bzr resolve file
1036
224
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1037
225
""")
1038
226
1039
227
    def test_take_other(self):
1040
228
        self.run_script("""
1041
229
$ bzr mv file.OTHER file
1042
230
$ bzr resolve file
1043
231
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1044
232
""")
1045
233
1046
234
    def test_resolve_taking_this(self):
1047
235
        self.run_script("""
1048
236
$ bzr resolve --take-this file
1049
237
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1050
238
""")
1051
239
1052
240
    def test_resolve_taking_other(self):
1053
241
        self.run_script("""
1054
242
$ bzr resolve --take-other file
1055
243
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1056
244
""")
1057
245
1058
246
1059
247
class TestResolveDuplicateEntry(TestResolveConflicts):
1060
248
1061
249
    preamble = """
1062
250
$ bzr init trunk
1063
251
$ cd trunk
1064
252
$ echo 'trunk content' >file
1065
253
$ bzr add file
1066
254
$ bzr commit -m 'Create trunk'
1067
255
$ echo 'trunk content too' >file2
1068
256
$ bzr add file2
1069
257
$ bzr commit -m 'Add file2 in trunk'
1070
258
1071
259
$ bzr branch . -r 1 ../branch
1072
260
$ cd ../branch
1073
261
$ echo 'branch content' >file2
1074
262
$ bzr add file2
1075
263
$ bzr commit -m 'Add file2 in branch'
1076
264
1077
265
$ bzr merge ../trunk
1078
266
2>+N  file2
1079
267
2>R   file2 => file2.moved
1080
268
2>Conflict adding file file2.  Moved existing file to file2.moved.
1081
269
2>1 conflicts encountered.
1082
270
"""
1083
271
1084
272
    def test_keep_this(self):
1085
273
        self.run_script("""
1086
274
$ bzr rm file2  --force
1087
275
$ bzr mv file2.moved file2
1088
276
$ bzr resolve file2
1089
277
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1090
278
""")
1091
279
1092
280
    def test_keep_other(self):
1093
281
        self.failIfExists('branch/file2.moved')
1094
282
        self.run_script("""
1095
283
$ bzr rm file2.moved --force
1096
284
$ bzr resolve file2
1097
285
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1098
286
""")
1099
287
        self.failIfExists('branch/file2.moved')
1100
288
1101
289
    def test_resolve_taking_this(self):
1102
290
        self.run_script("""
1103
291
$ bzr resolve --take-this file2
1104
292
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1105
293
""")
1106
294
1107
295
    def test_resolve_taking_other(self):
1108
296
        self.run_script("""
1109
297
$ bzr resolve --take-other file2
1110
298
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1111
299
""")
1112
300
1113
301
1114
302
class TestResolveUnversionedParent(TestResolveConflicts):
1115
303
1116
304
    # FIXME: Add the reverse tests: dir deleted in trunk, file added in branch
1117
305
1118
306
    # FIXME: While this *creates* UnversionedParent conflicts, this really only
1119
307
    # tests MissingParent resolution :-/
1120
308
    preamble = """
1121
309
$ bzr init trunk
1122
310
$ cd trunk
1123
311
$ mkdir dir
1124
312
$ bzr add dir
1125
313
$ bzr commit -m 'Create trunk'
1126
314
$ echo 'trunk content' >dir/file
1127
315
$ bzr add dir/file
1128
316
$ bzr commit -m 'Add dir/file in trunk'
1129
317
1130
318
$ bzr branch . -r 1 ../branch
1131
319
$ cd ../branch
1132
320
$ bzr rm dir
1133
321
$ bzr commit -m 'Remove dir in branch'
1134
322
1135
323
$ bzr merge ../trunk
1136
324
2>+N  dir/
1137
325
2>+N  dir/file
1138
326
2>Conflict adding files to dir.  Created directory.
1139
327
2>Conflict because dir is not versioned, but has versioned children.  Versioned directory.
1140
328
2>2 conflicts encountered.
1141
329
"""
1142
330
1143
331
    def test_take_this(self):
1144
332
        self.run_script("""
1145
333
$ bzr rm dir  --force
1146
334
$ bzr resolve dir
1147
335
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1148
336
""")
1149
337
1150
338
    def test_take_other(self):
1151
339
        self.run_script("""
1152
340
$ bzr resolve dir
1153
341
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1154
342
""")
1155
343
1156
344
1157
345
class TestResolveMissingParent(TestResolveConflicts):
1158
346
1159
347
    preamble = """
1160
348
$ bzr init trunk
1161
349
$ cd trunk
1162
350
$ mkdir dir
1163
351
$ echo 'trunk content' >dir/file
1164
352
$ bzr add
1165
353
$ bzr commit -m 'Create trunk'
1166
354
$ echo 'trunk content' >dir/file2
1167
355
$ bzr add dir/file2
1168
356
$ bzr commit -m 'Add dir/file2 in branch'
1169
357
1170
358
$ bzr branch . -r 1 ../branch
1171
359
$ cd ../branch
1172
360
$ bzr rm dir/file --force
1173
361
$ bzr rm dir
1174
362
$ bzr commit -m 'Remove dir/file'
1175
363
1176
364
$ bzr merge ../trunk
1177
365
2>+N  dir/
1178
366
2>+N  dir/file2
1179
367
2>Conflict adding files to dir.  Created directory.
1180
368
2>Conflict because dir is not versioned, but has versioned children.  Versioned directory.
1181
369
2>2 conflicts encountered.
1182
370
"""
1183
371
1184
372
    def test_keep_them_all(self):
1185
373
        self.run_script("""
1186
374
$ bzr resolve dir
1187
375
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1188
376
""")
1189
377
1190
378
    def test_adopt_child(self):
1191
379
        self.run_script("""
1192
380
$ bzr mv dir/file2 file2
1193
381
$ bzr rm dir --force
1194
382
$ bzr resolve dir
1195
383
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1196
384
""")
1197
385
1198
386
    def test_kill_them_all(self):
1199
387
        self.run_script("""
1200
388
$ bzr rm dir --force
1201
389
$ bzr resolve dir
1202
390
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1203
391
""")
1204
392
1205
393
    def test_resolve_taking_this(self):
1206
394
        self.run_script("""
1207
395
$ bzr resolve --take-this dir
1208
396
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1209
397
""")
1210
398
1211
399
    def test_resolve_taking_other(self):
1212
400
        self.run_script("""
1213
401
$ bzr resolve --take-other dir
1214
402
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1215
403
""")
1216
404
1217
405
1218
406
class TestResolveDeletingParent(TestResolveConflicts):
1219
407
1220
408
    preamble = """
1221
409
$ bzr init trunk
1222
410
$ cd trunk
1223
411
$ mkdir dir
1224
412
$ echo 'trunk content' >dir/file
1225
413
$ bzr add
1226
414
$ bzr commit -m 'Create trunk'
1227
415
$ bzr rm dir/file --force
1228
416
$ bzr rm dir --force
1229
417
$ bzr commit -m 'Remove dir/file'
1230
418
1231
419
$ bzr branch . -r 1 ../branch
1232
420
$ cd ../branch
1233
421
$ echo 'branch content' >dir/file2
1234
422
$ bzr add dir/file2
1235
423
$ bzr commit -m 'Add dir/file2 in branch'
1236
424
1237
425
$ bzr merge ../trunk
1238
426
2>-D  dir/file
1239
427
2>Conflict: can't delete dir because it is not empty.  Not deleting.
1240
428
2>Conflict because dir is not versioned, but has versioned children.  Versioned directory.
1241
429
2>2 conflicts encountered.
1242
430
"""
1243
431
1244
432
    def test_keep_them_all(self):
1245
433
        self.run_script("""
1246
434
$ bzr resolve dir
1247
435
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1248
436
""")
1249
437
1250
438
    def test_adopt_child(self):
1251
439
        self.run_script("""
1252
440
$ bzr mv dir/file2 file2
1253
441
$ bzr rm dir --force
1254
442
$ bzr resolve dir
1255
443
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1256
444
""")
1257
445
1258
446
    def test_kill_them_all(self):
1259
447
        self.run_script("""
1260
448
$ bzr rm dir --force
1261
449
$ bzr resolve dir
1262
450
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1263
451
""")
1264
452
1265
453
    def test_resolve_taking_this(self):
1266
454
        self.run_script("""
1267
455
$ bzr resolve --take-this dir
1268
456
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1269
457
""")
1270
458
1271
459
    def test_resolve_taking_other(self):
1272
460
        self.run_script("""
1273
461
$ bzr resolve --take-other dir
1274
462
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1275
463
""")
1276
464
1277
465
1278
466
class TestResolvePathConflict(TestResolveConflicts):
1279
467
1280
468
    preamble = """
1281
469
$ bzr init trunk
1282
470
$ cd trunk
1283
471
$ echo 'Boo!' >file
1284
472
$ bzr add
1285
473
$ bzr commit -m 'Create trunk'
1286
474
$ bzr mv file file-in-trunk
1287
475
$ bzr commit -m 'Renamed to file-in-trunk'
1288
476
1289
477
$ bzr branch . -r 1 ../branch
1290
478
$ cd ../branch
1291
479
$ bzr mv file file-in-branch
1292
480
$ bzr commit -m 'Renamed to file-in-branch'
1293
481
1294
482
$ bzr merge ../trunk
1295
483
2>R   file-in-branch => file-in-trunk
1296
484
2>Path conflict: file-in-branch / file-in-trunk
1297
485
2>1 conflicts encountered.
1298
486
"""
1299
487
1300
488
    def test_keep_source(self):
1301
489
        self.run_script("""
1302
490
$ bzr resolve file-in-trunk
1303
491
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1304
492
""")
1305
493
1306
494
    def test_keep_target(self):
1307
495
        self.run_script("""
1308
496
$ bzr mv file-in-trunk file-in-branch
1309
497
$ bzr resolve file-in-branch
1310
498
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1311
499
""")
1312
500
1313
501
    def test_resolve_taking_this(self):
1314
502
        self.run_script("""
1315
503
$ bzr resolve --take-this file-in-branch
1316
504
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1317
505
""")
1318
506
1319
507
    def test_resolve_taking_other(self):
1320
508
        self.run_script("""
1321
509
$ bzr resolve --take-other file-in-branch
1322
510
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1323
511
""")
1324
512
1325
513
1326
514
class TestResolveParentLoop(TestResolveConflicts):
1327
515
1328
516
    preamble = """
1329
517
$ bzr init trunk
1330
518
$ cd trunk
1331
519
$ bzr mkdir dir1
1332
520
$ bzr mkdir dir2
1333
521
$ bzr commit -m 'Create trunk'
1334
522
$ bzr mv dir2 dir1
1335
523
$ bzr commit -m 'Moved dir2 into dir1'
1336
524
1337
525
$ bzr branch . -r 1 ../branch
1338
526
$ cd ../branch
1339
527
$ bzr mv dir1 dir2
1340
528
$ bzr commit -m 'Moved dir1 into dir2'
1341
529
1342
530
$ bzr merge ../trunk
1343
531
2>Conflict moving dir2/dir1 into dir2.  Cancelled move.
1344
532
2>1 conflicts encountered.
1345
533
"""
1346
534
1347
535
    def test_take_this(self):
1348
536
        self.run_script("""
1349
537
$ bzr resolve dir2
1350
538
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1351
539
""")
1352
540
1353
541
    def test_take_other(self):
1354
542
        self.run_script("""
1355
543
$ bzr mv dir2/dir1 dir1
1356
544
$ bzr mv dir2 dir1
1357
545
$ bzr resolve dir2
1358
546
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1359
547
""")
1360
548
1361
549
    def test_resolve_taking_this(self):
1362
550
        self.run_script("""
1363
551
$ bzr resolve --take-this dir2
1364
552
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1365
553
""")
1366
554
        self.failUnlessExists('dir2')
1367
555
1368
556
    def test_resolve_taking_other(self):
1369
557
        self.run_script("""
1370
558
$ bzr resolve --take-other dir2
1371
559
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1372
560
""")
1373
561
        self.failUnlessExists('dir1')
1374
562
1375
563
1376
564
class TestResolveNonDirectoryParent(TestResolveConflicts):
1377
565
1378
566
    preamble = """
1379
567
$ bzr init trunk
1380
568
$ cd trunk
1381
569
$ bzr mkdir foo
1382
570
$ bzr commit -m 'Create trunk'
1383
571
$ echo "Boing" >foo/bar
1384
572
$ bzr add foo/bar
1385
573
$ bzr commit -m 'Add foo/bar'
1386
574
1387
575
$ bzr branch . -r 1 ../branch
1388
576
$ cd ../branch
1389
577
$ rm -r foo
1390
578
$ echo "Boo!" >foo
1391
579
$ bzr commit -m 'foo is now a file'
1392
580
1393
581
$ bzr merge ../trunk
1394
582
2>+N  foo.new/bar
1395
583
2>RK  foo => foo.new/
1396
584
# FIXME: The message is misleading, foo.new *is* a directory when the message
1397
585
# is displayed -- vila 090916
1398
586
2>Conflict: foo.new is not a directory, but has files in it.  Created directory.
1399
587
2>1 conflicts encountered.
1400
588
"""
1401
589
1402
590
    def test_take_this(self):
1403
591
        self.run_script("""
1404
592
$ bzr rm foo.new --force
1405
593
# FIXME: Isn't it weird that foo is now unkown even if foo.new has been put
1406
594
# aside ? -- vila 090916
1407
595
$ bzr add foo
1408
596
$ bzr resolve foo.new
1409
597
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1410
598
""")
1411
599
1412
600
    def test_take_other(self):
1413
601
        self.run_script("""
1414
602
$ bzr rm foo --force
1415
603
$ bzr mv foo.new foo
1416
604
$ bzr resolve foo
1417
605
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1418
606
""")
1419
607
1420
608
    def test_resolve_taking_this(self):
1421
609
        self.run_script("""
1422
610
$ bzr resolve --take-this foo.new
1423
611
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1424
612
""")
1425
613
1426
614
    def test_resolve_taking_other(self):
1427
615
        self.run_script("""
1428
616
$ bzr resolve --take-other foo.new
1429
617
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1430
618
""")
1431
619
1432
620
1433
621
class TestMalformedTransform(script.TestCaseWithTransportAndScript):
1434
622
1435
623
    def test_bug_430129(self):
1436
624
        # This is nearly like TestResolveNonDirectoryParent but with branch and
1437
625
        # trunk switched. As such it should certainly produce the same
1438
626
        # conflict.
1439
627
        self.run_script("""
1440
628
$ bzr init trunk
1441
629
$ cd trunk
1442
630
$ bzr mkdir foo
1443
631
$ bzr commit -m 'Create trunk'
1444
632
$ rm -r foo
1445
633
$ echo "Boo!" >foo
1446
634
$ bzr commit -m 'foo is now a file'
1447
635
1448
636
$ bzr branch . -r 1 ../branch
1449
637
$ cd ../branch
1450
638
$ echo "Boing" >foo/bar
1451
639
$ bzr add foo/bar
1452
640
$ bzr commit -m 'Add foo/bar'
1453
641
1454
642
$ bzr merge ../trunk
1455
643
2>bzr: ERROR: Tree transform is malformed [('unversioned executability', 'new-1')]
1456
644
""")
1457
645
1458
646
1459
647
class TestResolveActionOption(tests.TestCase):
1460
648
1461
649
    def setUp(self):
1462
650
        super(TestResolveActionOption, self).setUp()
1463
651
        self.options = [conflicts.ResolveActionOption()]
1464
652
        self.parser = option.get_optparser(dict((o.name, o)
1465
653
                                                for o in self.options))
1466
654
1467
655
    def parse(self, args):
1468
656
        return self.parser.parse_args(args)
1469
657
1470
658
    def test_unknown_action(self):
1471
659
        self.assertRaises(errors.BadOptionValue,
1472
660
                          self.parse, ['--action', 'take-me-to-the-moon'])
1473
661
1474
662
    def test_done(self):
1475
663
        opts, args = self.parse(['--action', 'done'])
1476
664
        self.assertEqual({'action':'done'}, opts)
1477
665
1478
666
    def test_take_this(self):
1479
667
        opts, args = self.parse(['--action', 'take-this'])
1480
668
        self.assertEqual({'action': 'take_this'}, opts)
1481
669
        opts, args = self.parse(['--take-this'])
1482
670
        self.assertEqual({'action': 'take_this'}, opts)
1483
671
1484
672
    def test_take_other(self):
1485
673
        opts, args = self.parse(['--action', 'take-other'])
1486
674
        self.assertEqual({'action': 'take_other'}, opts)
1487
675
        opts, args = self.parse(['--take-other'])
1488
676
        self.assertEqual({'action': 'take_other'}, opts)
1489
174
677
1490
=== modified file 'bzrlib/workingtree.py'
1491
--- bzrlib/workingtree.py	2010-01-31 12:05:38 +0000
1492
+++ bzrlib/workingtree.py	2010-02-04 13:06:32 +0000
1493
@@ -111,6 +111,9 @@
1494
111
111
1495
112
112
1496
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
1497
114
# TODO: Modifying the conflict objects or their type is currently nearly
1498
115
# impossible as there is no clear relationship between the working tree format
1499
116
# and the conflict list file format.
1500
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
117
CONFLICT_HEADER_1 = "BZR conflict list format 1"
1501
115
118
1502
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
119
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
Status:	Merged
Approved by:	John A Meinel on 2010-02-04
Approved revision:	not available
Merged at revision:	not available
Proposed branch:	lp:~vila/bzr/conflict-manager
Merge into:	lp:bzr
Prerequisite:	lp:~vila/bzr/cleanup-conflicts
Diff against target:	1502 lines (+954/-125) (has conflicts) 7 files modified NEWS (+8/-0) bzrlib/conflicts.py (+228/-36) bzrlib/help_topics/en/conflict-types.txt (+172/-52) bzrlib/option.py (+1/-1) bzrlib/tests/blackbox/test_conflicts.py (+39/-36) bzrlib/tests/test_conflicts.py (+503/-0) bzrlib/workingtree.py (+3/-0) Text conflict in NEWS
To merge this branch:	bzr merge lp:~vila/bzr/conflict-manager
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
John A Meinel		2010-01-04	Needs Fixing on 2010-02-04
Review via email: mp+16785@code.launchpad.net