Bazaar

Too many conflicts on 'bzr update'

Bug #116655 reported by Gioele Barabucci
This bug report is a duplicate of:  Bug #113809: update performs two merges. Edit Remove
2
Affects Status Importance Assigned to Milestone
Bazaar
New
Undecided
Unassigned

Bug Description

If you try to update a local branch where there are local commits and uncommited changes, bzr will find a lot of conflicts:

  $ bzr update
  Text conflict in one
  1 conflicts encountered.
  Text conflict in one
  Conflict adding file one.BASE. Moved existing file to one.BASE.moved.
  Conflict adding file one.OTHER. Moved existing file to one.OTHER.moved.
  Conflict adding file one.THIS. Moved existing file to one.THIS.moved.
  4 conflicts encountered.
  Updated to revision 1.

The attached script is a testcase for this strange behavior.

Revision history for this message
Gioele Barabucci (gioele) wrote :

Plese, run this script in a temporary empty directory.

Revision history for this message
Bubba Siggler (bud3) wrote : Re: [Bug 116655] Re: Too many conflicts on 'bzr update'

On 5/24/07, Robert Collins <email address hidden> wrote:
>
> *** This bug is a duplicate of bug 113809 ***
> https://bugs.launchpad.net/bugs/113809
>
> ** This bug has been marked a duplicate of bug 113809
> update performs two merges

Hi,
do I run the file bzr run 2_conflict, or use the install or merge.

bubba

--
> Too many conflicts on 'bzr update'
> https://bugs.launchpad.net/bugs/116655
> You received this bug notification because you are a member of Bazaar
> Developers, which is the registrant for Bazaar.
>

--
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFFkcN7yXWcajQQndYRAgbqAKCMyXN9Jx4g0X7jocg+aUSFz0x4LwCgrURW
eGtqLjpzQVYa9+gzpCRtB84=
=zrpM
-----END PGP SIGNATURE-----

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.