1
=== modified file 'bzrlib/conflicts.py'
2
--- bzrlib/conflicts.py	2009-03-23 14:59:43 +0000
3
+++ bzrlib/conflicts.py	2009-11-25 16:45:24 +0000
4
@@ -53,13 +53,12 @@
5
53
    instead.  (This is useful for editing all files with text conflicts.)
53
    instead.  (This is useful for editing all files with text conflicts.)
6
54
54
7
55
    Use bzr resolve when you have fixed a problem.
55
    Use bzr resolve when you have fixed a problem.
8
56
9
57
    See also bzr resolve.
10
58
    """
56
    """
11
59
    takes_options = [
57
    takes_options = [
12
60
            Option('text',
58
            Option('text',
13
61
                   help='List paths of files with text conflicts.'),
59
                   help='List paths of files with text conflicts.'),
14
62
        ]
60
        ]
15
61
    _see_also = ['resolve']
16
63
62
17
64
    def run(self, text=False):
63
    def run(self, text=False):
18
65
        from bzrlib.workingtree import WorkingTree
64
        from bzrlib.workingtree import WorkingTree
19
@@ -82,16 +81,15 @@
20
82
    before you should commit.
81
    before you should commit.
21
83
82
22
84
    Once you have fixed a problem, use "bzr resolve" to automatically mark
83
    Once you have fixed a problem, use "bzr resolve" to automatically mark
24
85
    text conflicts as fixed, resolve FILE to mark a specific conflict as
84
    text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
25
86
    resolved, or "bzr resolve --all" to mark all conflicts as resolved.
85
    resolved, or "bzr resolve --all" to mark all conflicts as resolved.
26
87
27
88
    See also bzr conflicts.
28
89
    """
86
    """
29
90
    aliases = ['resolved']
87
    aliases = ['resolved']
30
91
    takes_args = ['file*']
88
    takes_args = ['file*']
31
92
    takes_options = [
89
    takes_options = [
32
93
            Option('all', help='Resolve all conflicts in this tree.'),
90
            Option('all', help='Resolve all conflicts in this tree.'),
33
94
            ]
91
            ]
34
92
    _see_also = ['conflicts']
35
95
    def run(self, file_list=None, all=False):
93
    def run(self, file_list=None, all=False):
36
96
        from bzrlib.workingtree import WorkingTree
94
        from bzrlib.workingtree import WorkingTree
37
97
        if all:
95
        if all:
38
98
96
39
=== modified file 'bzrlib/help_topics/en/conflicts.txt'
40
--- bzrlib/help_topics/en/conflicts.txt	2007-12-25 04:17:50 +0000
41
+++ bzrlib/help_topics/en/conflicts.txt	2009-11-25 16:45:24 +0000
42
@@ -79,6 +79,29 @@
43
79
FILE".  Bazaar cannot auto-detect when conflicts of this kind have been
79
FILE".  Bazaar cannot auto-detect when conflicts of this kind have been
44
80
resolved.
80
resolved.
45
81
81
46
82
Tag conflicts
47
83
-------------
48
84
49
85
Typical message::
50
86
51
87
  Conflicting tags:
52
88
      version-0.1
53
89
54
90
When pulling from or pushing to another branch, Bazaar informs you about tags
55
91
that conflict between the two branches; that is the same tag points to two
56
92
different revisions.  You need not resolve these conflicts, but subsequent
57
93
uses of pull or push will result in the same message.
58
94
59
95
To resolve the conflict, you must apply the correct tags to either the target
60
96
branch or the source branch as appropriate.  Use "bzr tags --show-ids -d
61
97
SOURCE_URL" to see the tags in the source branch.  If you want to make the
62
98
target branch's tags match the source branch, then in the target branch do 
63
99
``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the
64
100
CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the source
65
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
66
102
branch.  (Note that pulling or pushing using --overwrite will overwrite all
67
103
tags as well.)
68
104
69
82
Duplicate paths
105
Duplicate paths
70
83
---------------
106
---------------
71
84
107
Reviewer	Date Requested	Status
John A Meinel	2009-11-30	Approve on 2009-11-30
Robert Collins (community)	2009-11-23	Approve on 2009-11-25
Review via email: mp+15158@code.staging.launchpad.net