Bazaar

Merging a branch into empty branch shows negative revision numbers in bzr log

Bug #522740 reported by Nicholas Allen
16
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned

Bug Description

bzr init test
cd test
echo hello >> hello.txt
bzr add
bzr ci -m "Add hello"
echo hello >> hello.txt
bzr ci -m "Another commit"

cd ../
bzr init test2
cd test2
bzr merge ../test
bzr ci -m "Merge"

bzr log

Revision history for this message
John A Meinel (jameinel) wrote :

Arguably this is a dupe of the "merge doesn't work correctly in a branch with 0 revisions" bugs, but it is certainly a different symptom, so it may end up being fixed differently.

Changed in bzr:
importance: Undecided → Low
status: New → Confirmed
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

I marked this as affecting me, because it freaks users out and several times I've had to explain to them how to fix their branches.

Revision history for this message
Eric Siegerman (eric97) wrote :

FYI: One of the bugs that John's referring to is bug 308562.

Vincent Ladeuil (vila)
tags: added: log
Changed in bzr:
importance: Low → Medium
Revision history for this message
Andrew Bennetts (spiv) wrote :

This still fails. The problem isn't log, it's the branch's revision-info:

$ bzr check --branch
found error:Internal check failed: revno does not match len(mainline) 1 != 3

$ cat .bzr/branch/last-revision
1 <email address hidden>

So as a workaround running “bzr reconcile” corrects this.

Generating incorrect data, even if easily corrected, is bad, so bumping the importance up a bit.

tags: added: commit merge
removed: log
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
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.