Ubuntu
bazaar package

Wrong merging on directories

Bug #269 reported by Fabio Massimo Di Nitto
6
Affects Status Importance Assigned to Milestone
bazaar (Ubuntu)
Invalid
Medium
Unassigned

Bug Description

How to reproduce:

Add a directory with 3 files to branch A.
Create branch B.
Add file 4 in the same dir together with the 3 files.

on branch A: baz mv <directory> <newname>

on branch B: baz merge branchA

the directory will be renamed to <newname>,
but file 4 is moved together with the directory
and marked as new file (according to baz lint).

this way it looks like the file has lost its history
(and probably did.. i didn't check it).
imho either the file is moved properly and baz lint
shouldn't see it as new, or a merge conflict should
be generated leaving the file in his original position.

personally i was expecting to see a merge conflict, since baz has no way to know if i really wanted to move the file or not.

Daniel Holbach (dholbach)
Changed in bazaar:
assignee: nobody → bazaar-developers
Robert Collins (lifeless)
Changed in bazaar:
assignee: bazaar-developers → nobody
Xavier Poinsard (xpoinsard)
Changed in bazaar:
assignee: nobody → lifeless
Revision history for this message
Robert Collins (lifeless) wrote :

Fabio, what version of baz was this in when you reported it ?

Robert Collins (lifeless)
Changed in bazaar:
assignee: lifeless → nobody
Revision history for this message
Fabio Massimo Di Nitto (fabbione) wrote :

I can't recall exactly, but i always run crack of the day. So it has to be something close to the day in which i opened the bug.

Barry deFreese (bddebian)
Changed in bazaar:
assignee: nobody → motu
status: New → Rejected
Barry deFreese (bddebian)
Changed in bazaar:
status: Rejected → New
Martin Meredith (mez)
Changed in bazaar:
assignee: motu → bazaar-developers
Robert Collins (lifeless)
Changed in bazaar:
assignee: bazaar-developers → nobody
Revision history for this message
Martin Bergner (martin-bergner) wrote :

is this still a problem, I could not reproduce this?

Changed in bazaar:
status: Unconfirmed → Needs Info
Revision history for this message
ville palo (vi64pa) wrote :

Please, reopen if this is still a problem.

Changed in bazaar:
status: Needs Info → Fix Released
Revision history for this message
ville palo (vi64pa) wrote :

Please, reopen if this is still a problem on edgy.

Changed in baz:
status: Unconfirmed → Fix Released
Revision history for this message
Fabio Massimo Di Nitto (fabbione) wrote :

are you closing bug at random?

Changed in bazaar:
status: Fix Released → Confirmed
Changed in baz:
status: Fix Released → Confirmed
Revision history for this message
Robert Collins (lifeless) wrote :

wont be fixed by upstream, as this code base is no longer being developed.

Changed in baz:
status: Confirmed → Rejected
Revision history for this message
ville palo (vi64pa) wrote :

Well, I was thinking this was reported 2005-03-30 and last comment
was 2005-08-31 before: "is this still a problem, I could not reproduce this?"
So I thought this is not a problem anymore.

So apparently it is still a problem?

Revision history for this message
Robert Collins (lifeless) wrote :

This wont be fixed in baz. baz has not changed since the bug was filed, so for someone using baz, it will still be a problem. They should upgrade to bzr.

Changed in bazaar:
status: Confirmed → Rejected
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.