Bazaar

joining/merging into an empty tree causes "tree out of date errors"

Bug #308562 reported by Jelmer Vernooij
20
This bug affects 4 people
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
High
Unassigned

Bug Description

ganieda:/data/tmp% bzr init --rich-root-pack c1
Standalone tree (format: rich-root-pack)
Location:
  branch root: c1
ganieda:/data/tmp% bzr init --rich-root-pack c2
Standalone tree (format: rich-root-pack)
Location:
  branch root: c2
ganieda:/data/tmp% cd c2
ganieda:/data/tmp/c2% touch a
ganieda:/data/tmp/c2% bzr add; bzr ci -m add\ a
added a
Committing to: /data/tmp/c2/
added a
Committed revision 1.
ganieda:/data/tmp/c2% cd ../c1
ganieda:/data/tmp/c1% bzr branch ../c2
Branched 1 revision(s).
ganieda:/data/tmp/c1% bzr join c2
renamed file:///data/tmp/c1/c2/.bzr to .bzr.retired.0
ganieda:/data/tmp/c1% bzr st
working tree is out of date, run 'bzr update'
renamed:
   => c2
unknown:
  c2/.bzr.retired.0/

Tags: join merge
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This is of course not a situation that'll be happening often in real-life. It doesn't happen when c1 is not empty.

Changed in bzr:
importance: Undecided → Low
status: New → Triaged
Martin Pool (mbp)
Changed in bzr:
status: Triaged → Confirmed
Dimitri John Ledkov (xnox)
tags: added: 2a join
Dimitri John Ledkov (xnox)
tags: removed: 2a
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Related bug 357818

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

bumping this to high since it is confusing when it happens.

summary: - joining into an empty tree causes "tree out of date errors"
+ joining/merging into an empty tree causes "tree out of date errors"
Changed in bzr:
importance: Low → High
Jelmer Vernooij (jelmer)
tags: added: merge
Revision history for this message
Eric Siegerman (eric97) wrote :

FYI: Bug 82555, which is marked as a duplicate of this one, contains a lengthy analysis. (No idea whether that analysis is valid, but it might be a good starting point.)

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

Here are some bugs that appear related (but I don't know whether they're strict dups, so not marking them as such):
  * Bug 242175: Better error message when merging into empty branch [requests a (better) error message, absent a real fix]
  * Bug 522740: Merging a branch into empty branch shows negative revision numbers in bzr log [a different symptom]
  * Bug 297768: switch does't work with empty branches
  * Bug 670291: Branching the 0. revision leads to weird behaviour ["switch" again]

Revision history for this message
Jonathan Riddell (jr) wrote :

Bug 242175 gives this a nicer error message saying merging into empty is not currently supported, this bug should remain open in the hope it can be supported again

Revision history for this message
Martin Packman (gz) wrote :

Reversing the dupe relationship between this bug and bug 82555 as that's older and more generic.

Milo Casagrande (milo)
no longer affects: linaro-image-tools
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Related questions

Remote bug watches

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