Bazaar

  1. Bug #322767
  2. Comment #19

Comment 19 for bug 322767

Revision history for this message
Vincent Ladeuil (vila) wrote : Re: [Bug 322767] Re: MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?

>>>>> GuilhemBichot <email address hidden> writes:

   > So I can commit, no warning.
    > I think I don't understand what has been fixed exactly.
    > The changelog says
    > http://doc.bazaar.canonical.com/bzr.dev/en/release-notes/bzr-2.2.0b1.html
    > "bzr add will not add conflict related files unless explicitly required. (Vincent Ladeuil, #322767, #414589)"
    > which to me should cover auto-added .moved files.

.moved are not auto-added, they are already versioned.

This type of conflict occurs when two 'foo' files are involved, one is
present in the 'THIS' branch while other is coming from the 'OTHER'
branch, both files are versioned in this case.

    > Maybe something with OTHER/BASE/THIS files instead?

OTHER/BASE/THIS files are created to help resolve the text conflicts.
They are not versioned so they need to be added via 'bzr add'.

The work in progress is still to help people *avoid* doing
'bzr resolve --all'